adjust reconsile service

Author: tfrancart

xls2rdf-lib/src/main/java/fr/sparna/rdf/xls2rdf/SkosPostProcessor.java

@@ -1,5 +1,10 @@
 package fr.sparna.rdf.xls2rdf;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.function.Predicate;
+
 import org.apache.commons.io.IOUtils;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Resource;
@@ -18,12 +23,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.function.Predicate;
-
 public class SkosPostProcessor implements Xls2RdfPostProcessorIfc {
   private static final String CALCULATE_BROADER_TRANSITIVE_SPARQL = "postprocessing/broaderTransitive.ru";
 
@@ -217,11 +216,7 @@ public HasRdfTypeTest(Model model) {
 
     @Override
     public boolean test(Resource resource) {
-      return
-              model.contains(resource, RDF.TYPE, null)
-              ||
-              model.contains(resource, RDF.TYPE, null)
-              ;
+      return model.contains(resource, RDF.TYPE, null);
     }
   }
 

xls2rdf-lib/src/main/java/fr/sparna/rdf/xls2rdf/Xls2RdfConverterFactory.java

@@ -1,12 +1,17 @@
 package fr.sparna.rdf.xls2rdf;
 
-import fr.sparna.rdf.xls2rdf.reconcile.SparqlReconcileService;
-import org.eclipse.rdf4j.repository.Repository;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import org.eclipse.rdf4j.repository.Repository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import fr.sparna.rdf.xls2rdf.reconcile.SparqlReconcileService;
+
 public class Xls2RdfConverterFactory {
+	
+	private Logger log = LoggerFactory.getLogger(this.getClass().getName());
 
 	private boolean applyPostProcessings = true;
 	private boolean generateXl = false;
@@ -35,14 +40,20 @@ public Xls2RdfConverter newConverter(ModelWriterIfc modelWriter, String lang) {
 		Xls2RdfConverter converter = new Xls2RdfConverter(modelWriter, lang);
 		if(this.applyPostProcessings) {
 			List<Xls2RdfPostProcessorIfc> postProcessors = new ArrayList<>();
+			// add QB post processor
+			postProcessors.add(new QBPostProcessor());
+			// add SKOS post processor
 			postProcessors.add(new SkosPostProcessor(this.generateBroaderTransitive));
+			// if needed, add SKOS-XL post-processor
 			if(this.generateXl || this.generateXlDefinitions) {
 				postProcessors.add(new SkosXlPostProcessor(generateXl, generateXlDefinitions));
 			}
+			
 			converter.setPostProcessors(postProcessors);
 		}
 
 		if(this.supportRepository != null) {
+			log.info("Setting a support repository that contains "+this.supportRepository.getConnection().size()+" triples");
 			converter.setReconcileService(new SparqlReconcileService(this.supportRepository));
 		}
 

xls2rdf-lib/src/main/java/fr/sparna/rdf/xls2rdf/reconcile/SparqlReconcileService.java

@@ -33,16 +33,16 @@ public Map<String, ReconcileResultIfc> reconcile(Map<String, ReconcileQueryIfc>
 				ReconcileQueryIfc aQuery = anEntry.getValue();
 
 				String sparql = ""
-						+ "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> "
-						+ "PREFIX skos: <http://www.w3.org/2004/02/skos/core#> "
-						+ "PREFIX foaf: <http://xmlns.com/foaf/0.1/> "
-						+ "PREFIX dct: <http://purl.org/dc/terms/> "
-						+ "PREFIX dc: <http://purl.org/dc/elements/1.1/> "
-						+ "PREFIX schema: <http://schema.org/> "
-						+ "SELECT ?x WHERE { "
-						+ " ?x rdfs:label|skos:prefLabel|skos:altLabel|skos:notation|foaf:name|dct:title|dc:title|dct:identifier|dc:identifier|schema:name ?literal ."
-						+ " FILTER(LCASE(STR(?literal)) = LCASE(\"%s\") )"
-						+ " %s "
+						+ "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> "+"\n"
+						+ "PREFIX skos: <http://www.w3.org/2004/02/skos/core#> "+"\n"
+						+ "PREFIX foaf: <http://xmlns.com/foaf/0.1/> "+"\n"
+						+ "PREFIX dct: <http://purl.org/dc/terms/> "+"\n"
+						+ "PREFIX dc: <http://purl.org/dc/elements/1.1/> "+"\n"
+						+ "PREFIX schema: <http://schema.org/> "+"\n"
+						+ "SELECT ?x WHERE { "+"\n"
+						+ " ?x rdfs:label|skos:prefLabel|skos:altLabel|skos:notation|foaf:name|dct:title|dc:title|dct:identifier|dc:identifier|schema:name ?literal ."+"\n"
+						+ " FILTER(LCASE(STR(?literal)) = LCASE(\"%s\") )"+"\n"
+						+ " %s "+"\n"
 						+ "}"
 						;
 
@@ -53,6 +53,7 @@ public Map<String, ReconcileResultIfc> reconcile(Map<String, ReconcileQueryIfc>
 				);
 
 				log.trace("Executing reconcile SPARQL : "+finalSparql);
+				// System.out.println("Executing reconcile SPARQL : "+finalSparql);
 				TupleQuery query = c.prepareTupleQuery(finalSparql);
 				query.evaluate(new AbstractTupleQueryResultHandler() {