version 2.1.6

sparna-git · Jan 31, 2022 · decf6bb · decf6bb
1 parent f2d7761
commit decf6bb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>fr.sparna.rdf.xls2rdf</groupId>
     <artifactId>xls2rdf-pom</artifactId>
-    <version>2.1.5</version>
+    <version>2.1.6</version>
     <packaging>pom</packaging>
 
     <name>XLS2RDF root POM</name>

diff --git a/xls2rdf-app/pom.xml b/xls2rdf-app/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>fr.sparna.rdf.xls2rdf</groupId>
         <artifactId>xls2rdf-pom</artifactId>
-        <version>2.1.5</version>
+        <version>2.1.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -121,7 +121,7 @@
         <dependency>
             <groupId>fr.sparna.rdf.xls2rdf</groupId>
             <artifactId>xls2rdf-lib</artifactId>
-            <version>2.1.5</version>
+            <version>2.1.6</version>
         </dependency>
 
 		<dependency>

diff --git a/xls2rdf-lib/pom.xml b/xls2rdf-lib/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>fr.sparna.rdf.xls2rdf</groupId>
         <artifactId>xls2rdf-pom</artifactId>
-        <version>2.1.5</version>
+        <version>2.1.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/xls2rdf-lib/src/main/java/fr/sparna/rdf/xls2rdf/Xls2RdfConverter.java b/xls2rdf-lib/src/main/java/fr/sparna/rdf/xls2rdf/Xls2RdfConverter.java
@@ -28,6 +28,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintStream;
@@ -662,7 +663,7 @@ public static void main(String[] args) throws Exception {
 		bc.configure((LoggerContext) LoggerFactory.getILoggerFactory());
 		((ch.qos.logback.classic.Logger) org.slf4j.LoggerFactory.getLogger("org.eclipse.rdf4j")).setLevel(ch.qos.logback.classic.Level.INFO);
 
-
+		runLikeInSkosPlay(new FileInputStream(args[0]), System.out, "en");
 		// Method 1 : save each scheme to a separate directory
 //		DirectoryModelWriter writer = new DirectoryModelWriter(new File("/home/thomas/sparna/00-Clients/Luxembourg/02-Migration/controlled-vocabularies-xls2skos/cv-from-xls2skos"));
 //		writer.setSaveGraphFile(true);
@@ -672,16 +673,16 @@ public static void main(String[] args) throws Exception {
 		// OutputStreamModelWriter ms = new OutputStreamModelWriter(new File("/home/thomas/controlled-vocabularies.ttl"));
 
 		// Method 3 : save each scheme to a separate entry in a ZIP file.
-		ZipOutputStreamModelWriter writer = new ZipOutputStreamModelWriter(new File("/home/thomas/sparna/00-Clients/Luxembourg/02-Migration/controlled-vocabularies-xls2skos/cv-from-xls2skos.zip"));
-		writer.setSaveGraphFile(true);
-		writer.setGraphSuffix("/graph");
+		// ZipOutputStreamModelWriter writer = new ZipOutputStreamModelWriter(new File("/home/thomas/sparna/00-Clients/Luxembourg/02-Migration/controlled-vocabularies-xls2skos/cv-from-xls2skos.zip"));
+		// writer.setSaveGraphFile(true);
+		// writer.setGraphSuffix("/graph");
 
-		Xls2RdfConverter me = new Xls2RdfConverter(writer, "fr");
-		me.setPostProcessors(Collections.singletonList(new SkosPostProcessor(false)));
+		// Xls2RdfConverter me = new Xls2RdfConverter(writer, "fr");
+		// me.setPostProcessors(Collections.singletonList(new SkosPostProcessor(false)));
 
 		// me.loadAllToFile(new File("/home/thomas/sparna/00-Clients/Sparna/20-Repositories/sparna/fr.sparna/rdf/skos/xls2skos/src/test/resources/test-excel-saved-from-libreoffice.xlsx"));
 		// me.loadAllToFile(new File("/home/thomas/sparna/00-Clients/Sparna/20-Repositories/sparna/fr.sparna/rdf/skos/xls2skos/src/test/resources/test-libreoffice.ods"));
-		me.processFile(new File("/home/thomas/sparna/00-Clients/Luxembourg/02-Migration/controlled-vocabularies-xls2skos/jolux-controlled-voc-travail-20161026-recup.xlsx"));
+		// me.processFile(new File("/home/thomas/sparna/00-Clients/Luxembourg/02-Migration/controlled-vocabularies-xls2skos/jolux-controlled-voc-travail-20161026-recup.xlsx"));
 		// me.processFile(new File("/home/thomas/sparna/00-Clients/Luxembourg/02-Migration/jolux-controlled-voc-travail-20161012.xlsx"));
 	}
 

diff --git a/xls2rdf-rest/pom.xml b/xls2rdf-rest/pom.xml
@@ -51,7 +51,7 @@
             <dependency>
                 <groupId>fr.sparna.rdf.xls2rdf</groupId>
                 <artifactId>xls2rdf-pom</artifactId>
-                <version>2.1.5</version>
+                <version>2.1.6</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -77,7 +77,7 @@
       <dependency>
           <groupId>fr.sparna.rdf.xls2rdf</groupId>
           <artifactId>xls2rdf-lib</artifactId>
-          <version>2.1.5</version>
+          <version>2.1.6</version>
       </dependency>
 
     <dependency>