You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2018/01/15 11:48:15 UTC
[10/10] jena git commit: Add TriG and NQ as langs for printing models
from cmd line query
Add TriG and NQ as langs for printing models from cmd line query
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/aa25db6c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/aa25db6c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/aa25db6c
Branch: refs/heads/master
Commit: aa25db6c35b296a0d4e792d7a7631b543cf727e6
Parents: 6283bdd
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jan 15 11:32:52 2018 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jan 15 11:32:52 2018 +0000
----------------------------------------------------------------------
.../jena/sparql/resultset/ResultsFormat.java | 19 ++++++++++++++-----
.../apache/jena/sparql/util/QueryExecUtils.java | 10 ++++++++++
2 files changed, 24 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/aa25db6c/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultsFormat.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultsFormat.java b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultsFormat.java
index f28a7bd..b959e60 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultsFormat.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultsFormat.java
@@ -63,7 +63,8 @@ public class ResultsFormat extends Symbol
static public ResultsFormat FMT_RDF_TTL = new ResultsFormat(contentTypeTurtle) ;
static public ResultsFormat FMT_RDF_TURTLE = new ResultsFormat(contentTypeTurtle) ;
static public ResultsFormat FMT_RDF_NT = new ResultsFormat(contentTypeNTriples) ;
- static public ResultsFormat FMT_TRIG = new ResultsFormat(contentTypeTriG) ;
+ static public ResultsFormat FMT_RDF_TRIG = new ResultsFormat(contentTypeTriG) ;
+ static public ResultsFormat FMT_RDF_NQ = new ResultsFormat(contentTypeNQuads) ;
static public ResultsFormat FMT_UNKNOWN = new ResultsFormat("unknown") ;
// ---- Compatibility
@@ -97,8 +98,12 @@ public class ResultsFormat extends Symbol
names.put("graph", FMT_RDF_TTL) ;
names.put("nt", FMT_RDF_NT) ;
names.put("n-triples", FMT_RDF_NT) ;
+ names.put("ntriples", FMT_RDF_NT) ;
- names.put("trig", FMT_TRIG) ;
+ names.put("nq", FMT_RDF_NQ) ;
+ names.put("nquads", FMT_RDF_NQ) ;
+ names.put("n-quads", FMT_RDF_NQ) ;
+ names.put("trig", FMT_RDF_TRIG) ;
}
@@ -119,7 +124,9 @@ public class ResultsFormat extends Symbol
}
public static boolean isDatasetSyntax(ResultsFormat fmt) {
- if ( FMT_TRIG.equals(fmt) )
+ if ( FMT_RDF_TRIG.equals(fmt) )
+ return true;
+ if ( FMT_RDF_NQ.equals(fmt) )
return true;
return false;
}
@@ -164,9 +171,11 @@ public class ResultsFormat extends Symbol
if ( url.endsWith(".tsv") )
return FMT_RS_TSV;
- // Trig for Dataset
+ // -- Dataset
if ( url.endsWith(".trig") )
- return FMT_TRIG;
+ return FMT_RDF_TRIG;
+ if ( url.endsWith(".nq") )
+ return FMT_RDF_NQ;
return defaultFormat;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/aa25db6c/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java
index dc495b0..61f2730 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java
@@ -241,6 +241,16 @@ public class QueryExecUtils {
return ;
}
+ if ( outputFormat.equals(ResultsFormat.FMT_RDF_NQ) ) {
+ model.write(System.out, "N-QUADS", null) ;
+ return ;
+ }
+
+ if ( outputFormat.equals(ResultsFormat.FMT_RDF_TRIG) ) {
+ model.write(System.out, "TriG", null) ;
+ return ;
+ }
+
System.err.println("Unknown format: " + outputFormat) ;
}