From db9592a86c33c8112133c042954daeb74aaf017d Mon Sep 17 00:00:00 2001 From: Dries Marzougui Date: Tue, 21 Aug 2018 14:26:42 +0200 Subject: [PATCH 1/5] changed output to all NQuads --- src/main/java/be/ugent/rml/cli/Main.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/main/java/be/ugent/rml/cli/Main.java b/src/main/java/be/ugent/rml/cli/Main.java index b94c09b7..50e2e337 100644 --- a/src/main/java/be/ugent/rml/cli/Main.java +++ b/src/main/java/be/ugent/rml/cli/Main.java @@ -128,17 +128,12 @@ public static void main(String [] args) { QuadStore result = executor.execute(triplesMaps, checkOptionPresence(removeduplicatesOption, lineArgs, configFile)); - TriplesQuads tq = Utils.getTriplesAndQuads(result.getQuads(null, null, null, null)); String outputFile = getPriorityOptionValue(outputfileOption, lineArgs, configFile); - if (!tq.getTriples().isEmpty()) { - //write triples - writeOutput("triple", tq.getTriples(), "nt", outputFile); - } - - if (!tq.getQuads().isEmpty()) { + if (result.getQuads(null, null, null, null).isEmpty()) { //write quads - writeOutput("quad", tq.getQuads(), "nq", outputFile); + writeOutput("quad", result.getQuads(null, null, null, null), + "nq", outputFile); } } } catch( ParseException exp ) { From 17e3ca8bd6cf9c243d69f86a1c9e26a534e744b2 Mon Sep 17 00:00:00 2001 From: Dries Marzougui Date: Thu, 23 Aug 2018 14:46:45 +0200 Subject: [PATCH 2/5] no automatically added extension --- src/main/java/be/ugent/rml/cli/Main.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/be/ugent/rml/cli/Main.java b/src/main/java/be/ugent/rml/cli/Main.java index 50e2e337..227b0d0d 100644 --- a/src/main/java/be/ugent/rml/cli/Main.java +++ b/src/main/java/be/ugent/rml/cli/Main.java @@ -132,8 +132,7 @@ public static void main(String [] args) { String outputFile = getPriorityOptionValue(outputfileOption, lineArgs, configFile); if (result.getQuads(null, null, null, null).isEmpty()) { //write quads - writeOutput("quad", result.getQuads(null, null, null, null), - "nq", outputFile); + writeOutput("quad", result.getQuads(null, null, null, null), outputFile); } } } catch( ParseException exp ) { @@ -171,7 +170,7 @@ private static void setLoggerLevel(Level level) { ((ch.qos.logback.classic.Logger) root).setLevel(level); } - private static void writeOutput(String what, List output, String extension, String outputFile) { + private static void writeOutput(String what, List output, String outputFile) { if (output.size() > 1) { logger.info(output.size() + " " + what + "s were generated"); } else { @@ -180,11 +179,11 @@ private static void writeOutput(String what, List output, String extension //if output file provided, write to triples output file if (outputFile != null) { - File targetFile = new File(outputFile + "." + extension); + File targetFile = new File(outputFile); logger.info("Writing " + what + " to " + targetFile.getPath() + "..."); if (!targetFile.isAbsolute()) { - targetFile = new File(System.getProperty("user.dir") + "/" + outputFile + "." + extension); + targetFile = new File(System.getProperty("user.dir") + "/" + outputFile); } try { From 8720ba820d328ea3388d05a521f64b8d14259b52 Mon Sep 17 00:00:00 2001 From: Dries Marzougui Date: Fri, 24 Aug 2018 11:07:26 +0200 Subject: [PATCH 3/5] fixed if condition --- src/main/java/be/ugent/rml/cli/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/be/ugent/rml/cli/Main.java b/src/main/java/be/ugent/rml/cli/Main.java index 227b0d0d..b97a7b68 100644 --- a/src/main/java/be/ugent/rml/cli/Main.java +++ b/src/main/java/be/ugent/rml/cli/Main.java @@ -130,7 +130,7 @@ public static void main(String [] args) { String outputFile = getPriorityOptionValue(outputfileOption, lineArgs, configFile); - if (result.getQuads(null, null, null, null).isEmpty()) { + if (!result.getQuads(null, null, null).isEmpty()) { //write quads writeOutput("quad", result.getQuads(null, null, null, null), outputFile); } From 3ead73f97a576f2e56b1dfb8c7fcb44a76996ebe Mon Sep 17 00:00:00 2001 From: Ben De Meester Date: Fri, 24 Aug 2018 15:10:25 +0200 Subject: [PATCH 4/5] combined variables --- .gitignore | 2 ++ .gitlab-ci.yml | 16 +++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 58e204ae..e128b2c8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ target rmlmapper.iml .DS_Store +.settings +.vscode diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9ab4346..faaad8e8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,13 @@ variables: # `showDateTime` will show the passed time in milliseconds. # MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true" MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository" + # Postgres + POSTGRES_DB: postgres + POSTGRES_USER: postgres + POSTGRES_PASSWORD: "" + # SQLServer + ACCEPT_EULA: Y + SA_PASSWORD: "YourSTRONG!Passw0rd" cache: key: ${CI_JOB_NAME} @@ -19,12 +26,3 @@ services: - postgres:10.4 - name: microsoft/mssql-server-linux:latest alias: sqlserver - -variables: - # Postgres - POSTGRES_DB: postgres - POSTGRES_USER: postgres - POSTGRES_PASSWORD: "" - # SQLServer - ACCEPT_EULA: Y - SA_PASSWORD: "YourSTRONG!Passw0rd" \ No newline at end of file From 08fdb508507df0218ca20abeb9948e3244dec53c Mon Sep 17 00:00:00 2001 From: Pieter Heyvaert Date: Mon, 27 Aug 2018 13:59:49 +0200 Subject: [PATCH 5/5] do not print null when no graph provided --- buildNumber.properties | 4 +- src/main/java/be/ugent/rml/Utils.java | 47 +++---------------- src/main/java/be/ugent/rml/cli/Main.java | 27 ++++------- .../java/be/ugent/rml/store/TriplesQuads.java | 21 --------- 4 files changed, 19 insertions(+), 80 deletions(-) delete mode 100644 src/main/java/be/ugent/rml/store/TriplesQuads.java diff --git a/buildNumber.properties b/buildNumber.properties index 8196f3a9..d9afa540 100644 --- a/buildNumber.properties +++ b/buildNumber.properties @@ -1,3 +1,3 @@ #maven.buildNumber.plugin properties file -#Fri Aug 17 13:40:48 CEST 2018 -buildNumber0=43 +#Mon Aug 27 13:58:09 CEST 2018 +buildNumber0=45 diff --git a/src/main/java/be/ugent/rml/Utils.java b/src/main/java/be/ugent/rml/Utils.java index 25a9d35f..0843b4b1 100644 --- a/src/main/java/be/ugent/rml/Utils.java +++ b/src/main/java/be/ugent/rml/Utils.java @@ -3,7 +3,6 @@ import be.ugent.rml.records.Record; import be.ugent.rml.store.Quad; import be.ugent.rml.store.QuadStore; -import be.ugent.rml.store.TriplesQuads; import be.ugent.rml.store.RDF4JStore; import be.ugent.rml.term.Literal; import be.ugent.rml.term.NamedNode; @@ -333,20 +332,6 @@ public static QuadStore readTurtle(File mappingFile) { return Utils.readTurtle(mappingFile, RDFFormat.TURTLE); } - public static boolean isBlankNode(String value) { - return value.startsWith("_:"); - } - - public static String toNTriples(List quads) { - StringBuilder output = new StringBuilder(); - - for (Quad q : quads) { - output.append(Utils.getNTripleOfQuad(q) + "\n"); - } - - return output.toString(); - } - public static String toNQuads(List quads) { StringBuilder output = new StringBuilder(); @@ -357,39 +342,22 @@ public static String toNQuads(List quads) { return output.toString(); } - public static void toNTriples(List quads, Writer out) throws IOException { - for (Quad q : quads) { - out.write(Utils.getNTripleOfQuad(q) + "\n"); - } - } - public static void toNQuads(List quads, Writer out) throws IOException { for (Quad q : quads) { out.write(Utils.getNQuadOfQuad(q) + "\n"); } } - public static TriplesQuads getTriplesAndQuads(List all) { - List triples = new ArrayList<>(); - List quads = new ArrayList<>(); + private static String getNQuadOfQuad(Quad q) { + String str = q.getSubject() + " " + q.getPredicate() + " " + q.getObject(); - for (Quad q: all) { - if (q.getGraph() == null || q.getGraph().equals("")) { - triples.add(q); - } else { - quads.add(q); - } + if (q.getGraph() != null) { + str += " " + q.getGraph(); } - return new TriplesQuads(triples, quads); - } + str += "."; - private static String getNTripleOfQuad(Quad q) { - return q.getSubject() + " " + q.getPredicate() + " " + q.getObject() + "."; - } - - private static String getNQuadOfQuad(Quad q) { - return q.getSubject() + " " + q.getPredicate() + " " + q.getObject() + " " + q.getGraph() + "."; + return str; } public static String encodeURI(String url) { @@ -448,8 +416,7 @@ public static int selectedColumnHash(String query) { throw new Error("Invalid query: " + query); } - public static String readFile(String path, Charset encoding) throws IOException - { + public static String readFile(String path, Charset encoding) throws IOException { if (encoding == null) { encoding = StandardCharsets.UTF_8; } diff --git a/src/main/java/be/ugent/rml/cli/Main.java b/src/main/java/be/ugent/rml/cli/Main.java index b97a7b68..66cbe97f 100644 --- a/src/main/java/be/ugent/rml/cli/Main.java +++ b/src/main/java/be/ugent/rml/cli/Main.java @@ -6,7 +6,6 @@ import be.ugent.rml.records.RecordsFactory; import be.ugent.rml.store.Quad; import be.ugent.rml.store.QuadStore; -import be.ugent.rml.store.TriplesQuads; import be.ugent.rml.term.NamedNode; import be.ugent.rml.term.Term; import ch.qos.logback.classic.Level; @@ -130,9 +129,11 @@ public static void main(String [] args) { String outputFile = getPriorityOptionValue(outputfileOption, lineArgs, configFile); - if (!result.getQuads(null, null, null).isEmpty()) { + List quads = result.getQuads(null, null, null); + + if (!quads.isEmpty()) { //write quads - writeOutput("quad", result.getQuads(null, null, null, null), outputFile); + writeOutput(quads, outputFile); } } } catch( ParseException exp ) { @@ -170,17 +171,17 @@ private static void setLoggerLevel(Level level) { ((ch.qos.logback.classic.Logger) root).setLevel(level); } - private static void writeOutput(String what, List output, String outputFile) { + private static void writeOutput(List output, String outputFile) { if (output.size() > 1) { - logger.info(output.size() + " " + what + "s were generated"); + logger.info(output.size() + " quads were generated"); } else { - logger.info(output.size() + " " + what + " was generated"); + logger.info(output.size() + " quad was generated"); } //if output file provided, write to triples output file if (outputFile != null) { File targetFile = new File(outputFile); - logger.info("Writing " + what + " to " + targetFile.getPath() + "..."); + logger.info("Writing quads to " + targetFile.getPath() + "..."); if (!targetFile.isAbsolute()) { targetFile = new File(System.getProperty("user.dir") + "/" + outputFile); @@ -189,11 +190,7 @@ private static void writeOutput(String what, List output, String outputFil try { BufferedWriter out = new BufferedWriter(new FileWriter(outputFile)); - if (what.equals("triple")) { - Utils.toNTriples(output, out); - } else { - Utils.toNQuads(output, out); - } + Utils.toNQuads(output, out); out.close(); logger.info("Writing to " + targetFile.getPath() + " is done."); @@ -201,11 +198,7 @@ private static void writeOutput(String what, List output, String outputFil System.err.println( "Writing output to file failed. Reason: " + e.getMessage() ); } } else { - if (what.equals("triple")) { - System.out.println(Utils.toNTriples(output)); - } else { - System.out.println(Utils.toNQuads(output)); - } + System.out.println(Utils.toNQuads(output)); } } } diff --git a/src/main/java/be/ugent/rml/store/TriplesQuads.java b/src/main/java/be/ugent/rml/store/TriplesQuads.java deleted file mode 100644 index b5fb2064..00000000 --- a/src/main/java/be/ugent/rml/store/TriplesQuads.java +++ /dev/null @@ -1,21 +0,0 @@ -package be.ugent.rml.store; - -import java.util.List; - -public class TriplesQuads { - - private List triples, quads; - - public TriplesQuads(List triples, List quads) { - this.triples = triples; - this.quads = quads; - } - - public List getTriples() { - return triples; - } - - public List getQuads() { - return quads; - } -}