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 2016/05/11 21:57:59 UTC

[2/2] jena git commit: Allow other output formats.

Allow other output formats.

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5e8d7fac
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5e8d7fac
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5e8d7fac

Branch: refs/heads/master
Commit: 5e8d7fac679b657e1a75b7f6a2cbe17e096dbee0
Parents: 61ee44a
Author: Andy Seaborne <an...@apache.org>
Authored: Wed May 11 22:53:19 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed May 11 22:53:19 2016 +0100

----------------------------------------------------------------------
 jena-cmds/src/main/java/tdb/tdbdump.java | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/5e8d7fac/jena-cmds/src/main/java/tdb/tdbdump.java
----------------------------------------------------------------------
diff --git a/jena-cmds/src/main/java/tdb/tdbdump.java b/jena-cmds/src/main/java/tdb/tdbdump.java
index 093ae9e..1817dea 100644
--- a/jena-cmds/src/main/java/tdb/tdbdump.java
+++ b/jena-cmds/src/main/java/tdb/tdbdump.java
@@ -18,13 +18,16 @@
 
 package tdb;
 
-import org.apache.jena.riot.Lang ;
+import arq.cmdline.ModLangOutput ;
 import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.jena.riot.RDFFormat ;
 import org.apache.jena.sparql.core.DatasetGraph ;
 import tdb.cmdline.CmdTDB ;
 
 public class tdbdump extends CmdTDB
 {
+    static ModLangOutput modLangOutput = new ModLangOutput() ;
+    
     static public void main(String... argv)
     { 
         CmdTDB.init() ;
@@ -34,18 +37,29 @@ public class tdbdump extends CmdTDB
     protected tdbdump(String[] argv)
     {
         super(argv) ;
+        addModule(modLangOutput) ;
     }
     
     @Override
     protected String getSummary()
     {
-        return getCommandName()+" : Write N-Quads to stdout" ;
+        return getCommandName()+" : Write a dataset to stdout (defaults to N-Quads)" ;
     }
 
     @Override
     protected void exec()
     {
         DatasetGraph dsg = super.getDatasetGraphTDB() ;
-        RDFDataMgr.write(System.out, dsg, Lang.NQUADS) ;
+        
+        // Prefer stream over fully pretty output formats.
+        RDFFormat fmt = modLangOutput.getOutputStreamFormat() ;
+        // Stream writing happens naturally - no need to call StreamRDFWriter.
+        //if ( fmt != null && StreamRDFWriter.registered(fmt) )
+        if ( fmt == null )
+            fmt = modLangOutput.getOutputFormatted() ;
+        if ( fmt == null )
+            // Default.
+            fmt = RDFFormat.NQUADS ;
+        RDFDataMgr.write(System.out, dsg, fmt) ;
     }
 }