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 2014/08/26 21:43:17 UTC
svn commit: r1620711 - in /jena/trunk/jena-arq/src/main/java:
arq/cmdline/ModLangOutput.java riotcmd/CmdLangParse.java
Author: andy
Date: Tue Aug 26 19:43:17 2014
New Revision: 1620711
URL: http://svn.apache.org/r1620711
Log:
JENA-768 : Enable using choice of output format.
Modified:
jena/trunk/jena-arq/src/main/java/arq/cmdline/ModLangOutput.java
jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java
Modified: jena/trunk/jena-arq/src/main/java/arq/cmdline/ModLangOutput.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/arq/cmdline/ModLangOutput.java?rev=1620711&r1=1620710&r2=1620711&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/arq/cmdline/ModLangOutput.java (original)
+++ jena/trunk/jena-arq/src/main/java/arq/cmdline/ModLangOutput.java Tue Aug 26 19:43:17 2014
@@ -18,7 +18,14 @@
package arq.cmdline;
+import java.util.HashSet ;
+import java.util.Set ;
+
+import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFFormat ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.system.StreamRDFWriter ;
+import arq.cmd.CmdException ;
public class ModLangOutput implements ArgModuleGeneral
{
@@ -35,26 +42,27 @@ public class ModLangOutput implements Ar
public void processArgs(CmdArgModule cmdLine) {
if ( cmdLine.contains(argOutput) ) {
String langName = cmdLine.getValue(argOutput) ;
-// Lang output = RDFLanguages.nameToLang(langName) ;
-// if ( output == null )
-// throw new CmdException("Not recognized as an RDF language : '"+langName+"'") ;
-// if ( ! StreamRDFWriter.registered(output) ) {
-// // ** Java8
-//// StreamRDFWriter.registered().stream()
-//// .map(fmt -> fmt.getLang())
-//// .distinct()
-//// .forEach(x -> System.err.println(" "+x.getLabel())) ;
-//
-// Set<Lang> seen = new HashSet<>() ;
-// for ( RDFFormat fmt : StreamRDFWriter.registered()) {
-// if ( seen.contains(fmt.getLang()) )
-// continue ;
-// seen.add(fmt.getLang()) ;
-// System.err.println(" "+fmt.getLang().getLabel()) ;
-// }
-//
-// throw new CmdException("Not recognized as an streaming RDF language : '"+langName+"'") ;
-// }
+ Lang output = RDFLanguages.nameToLang(langName) ;
+ if ( output == null )
+ throw new CmdException("Not recognized as an RDF language : '"+langName+"'") ;
+ if ( ! StreamRDFWriter.registered(output) ) {
+ // ** Java8
+// StreamRDFWriter.registered().stream()
+// .map(fmt -> fmt.getLang())
+// .distinct()
+// .forEach(x -> System.err.println(" "+x.getLabel())) ;
+
+ Set<Lang> seen = new HashSet<>() ;
+ for ( RDFFormat fmt : StreamRDFWriter.registered()) {
+ if ( seen.contains(fmt.getLang()) )
+ continue ;
+ seen.add(fmt.getLang()) ;
+ System.err.println(" "+fmt.getLang().getLabel()) ;
+ }
+
+ throw new CmdException("Not recognized as an streaming RDF language : '"+langName+"'") ;
+ }
+ format = StreamRDFWriter.defaultSerialization(output) ;
}
}
Modified: jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java?rev=1620711&r1=1620710&r2=1620711&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java Tue Aug 26 19:43:17 2014
@@ -81,10 +81,10 @@ public abstract class CmdLangParse exten
{
super(argv) ;
+ super.addModule(modSymbol) ;
super.addModule(modTime) ;
- super.addModule(modLangParse) ;
super.addModule(modLangOutput) ;
- super.addModule(modSymbol) ;
+ super.addModule(modLangParse) ;
super.modVersion.addClass(Jena.class) ;
super.modVersion.addClass(ARQ.class) ;
@@ -97,7 +97,7 @@ public abstract class CmdLangParse exten
protected String getSummary()
{
//return getCommandName()+" [--time] [--check|--noCheck] [--sink] [--base=IRI] [--skip | --stopOnError] file ..." ;
- return getCommandName()+" [--time] [--check|--noCheck] [--sink] [--base=IRI] file ..." ;
+ return getCommandName()+" [--time] [--check|--noCheck] [--sink] [--base=IRI] [--out=FORMAT] file ..." ;
}
protected long totalMillis = 0 ;
@@ -268,15 +268,10 @@ public abstract class CmdLangParse exten
}
protected StreamRDF createSink() {
- StreamRDF s = StreamRDFLib.sinkNull() ;
- if ( ! modLangParse.toBitBucket() )
- s = StreamRDFLib.writer(output) ;
- else {
- RDFFormat fmt = modLangOutput.getOutputFormat() ;
- // Framework : Ignore for now.
- }
-
- return s ;
+ if ( modLangParse.toBitBucket() )
+ return StreamRDFLib.sinkNull() ;
+ RDFFormat fmt = modLangOutput.getOutputFormat() ;
+ return StreamRDFWriter.getWriterStream(System.out, fmt) ;
}
protected Tokenizer makeTokenizer(InputStream in)