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 2011/08/14 18:20:17 UTC
svn commit: r1157556 - in /incubator/jena: Jena2/ARQ/trunk/src-dev/dev/
Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/junit/
Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/resultset/
Jena2/ARQ/trunk/src/arq/ Jena2/ARQ/trunk/src/arq/cmdline/ Jena2/AR...
Author: andy
Date: Sun Aug 14 16:20:17 2011
New Revision: 1157556
URL: http://svn.apache.org/viewvc?rev=1157556&view=rev
Log:
Tidying up handling of result formats and command line usage of result formats.
Added:
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/resultset/ResultFormat.java
- copied, changed from r1157415, incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/resultset/ResultSetFormat.java
Removed:
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/resultset/ResultSetFormat.java
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/resultset/ResultsFormat.java
Modified:
incubator/jena/Jena2/ARQ/trunk/src-dev/dev/DevARQ.java
incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/junit/TestItem.java
incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/resultset/TestResultSet.java
incubator/jena/Jena2/ARQ/trunk/src/arq/cmdline/ModResultsIn.java
incubator/jena/Jena2/ARQ/trunk/src/arq/cmdline/ModResultsOut.java
incubator/jena/Jena2/ARQ/trunk/src/arq/query.java
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/BIOInput.java
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/ResultSetFactory.java
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/ResultSetFormatter.java
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/sse/builders/BuilderExec.java
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/util/QueryExecUtils.java
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/util/TranslationTable.java
incubator/jena/Scratch/AFS/trunk/src-dev/dev/RunAFS.java
Modified: incubator/jena/Jena2/ARQ/trunk/src-dev/dev/DevARQ.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src-dev/dev/DevARQ.java?rev=1157556&r1=1157555&r2=1157556&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src-dev/dev/DevARQ.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src-dev/dev/DevARQ.java Sun Aug 14 16:20:17 2011
@@ -3,6 +3,8 @@ package dev ;
public class DevARQ
{
+ // ResultSetFormat and ResultsFormat - need just one.
+
// FILTER(?x=?y) optimization - at least FILTER(sameTerm(?x,?y))
// FILTER(?x=<x> && ...) does not push down on the ?x=<x>
// Do FILTER placement before filter equality -- but dnager of breaking up BGPs.
Modified: incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/junit/TestItem.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/junit/TestItem.java?rev=1157556&r1=1157555&r2=1157556&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/junit/TestItem.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/junit/TestItem.java Sun Aug 14 16:20:17 2011
@@ -16,7 +16,7 @@ import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.Resource ;
import com.hp.hpl.jena.rdf.model.Statement ;
import com.hp.hpl.jena.sparql.core.DataFormat ;
-import com.hp.hpl.jena.sparql.resultset.ResultSetFormat ;
+import com.hp.hpl.jena.sparql.resultset.ResultFormat ;
import com.hp.hpl.jena.sparql.resultset.SPARQLResult ;
import com.hp.hpl.jena.sparql.vocabulary.TestManifest ;
import com.hp.hpl.jena.sparql.vocabulary.TestManifestX ;
@@ -150,9 +150,9 @@ public class TestItem
{
if ( resultFile == null )
return null ;
- ResultSetFormat format = ResultSetFormat.guessSyntax(resultFile) ;
+ ResultFormat format = ResultFormat.guessSyntax(resultFile) ;
- if ( format.isRDFGraphSyntax() )
+ if ( ResultFormat.isRDFGraphSyntax(format) )
{
Model m = FileManager.get().loadModel(resultFile) ;
return new SPARQLResult(m) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/resultset/TestResultSet.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/resultset/TestResultSet.java?rev=1157556&r1=1157555&r2=1157556&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/resultset/TestResultSet.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/resultset/TestResultSet.java Sun Aug 14 16:20:17 2011
@@ -134,22 +134,22 @@ public class TestResultSet extends TestC
@Test public void test_RS_7()
{
ResultSet rs = ResultSetFactory.load("testing/ResultSet/output.srx") ;
- test_RS_fmt(rs, ResultSetFormat.syntaxXML, true) ;
+ test_RS_fmt(rs, ResultFormat.FMT_RS_XML, true) ;
}
@Test public void test_RS_8()
{
ResultSet rs = ResultSetFactory.load("testing/ResultSet/output.srx") ;
- test_RS_fmt(rs, ResultSetFormat.syntaxJSON, true) ;
+ test_RS_fmt(rs, ResultFormat.FMT_RS_JSON, true) ;
}
@Test public void test_RS_9()
{
ResultSet rs = ResultSetFactory.load("testing/ResultSet/output.srx") ;
- test_RS_fmt(rs, ResultSetFormat.syntaxRDF_XML, false) ;
+ test_RS_fmt(rs, ResultFormat.FMT_RDF_XML, false) ;
}
- private void test_RS_fmt(ResultSet rs, ResultSetFormat fmt, boolean ordered)
+ private void test_RS_fmt(ResultSet rs, ResultFormat fmt, boolean ordered)
{
ResultSetRewindable rs1 = ResultSetFactory.makeRewindable(rs) ;
ByteArrayOutputStream arr = new ByteArrayOutputStream() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/arq/cmdline/ModResultsIn.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/arq/cmdline/ModResultsIn.java?rev=1157556&r1=1157555&r2=1157556&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/arq/cmdline/ModResultsIn.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/arq/cmdline/ModResultsIn.java Sun Aug 14 16:20:17 2011
@@ -12,14 +12,14 @@ import com.hp.hpl.jena.query.ResultSet ;
import com.hp.hpl.jena.query.ResultSetFactory ;
import com.hp.hpl.jena.shared.NotFoundException ;
import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
-import com.hp.hpl.jena.sparql.resultset.ResultSetFormat ;
+import com.hp.hpl.jena.sparql.resultset.ResultFormat ;
public class ModResultsIn implements ArgModuleGeneral
{
protected final ArgDecl resultsInputFmtDecl = new ArgDecl(ArgDecl.HasValue, "in") ;
protected final ArgDecl fileDecl = new ArgDecl(ArgDecl.HasValue, "file") ;
- private ResultSetFormat inputFormat = ResultSetFormat.syntaxText ;
+ private ResultFormat inputFormat = ResultFormat.FMT_TEXT ;
private String resultsFilename = null ;
private ResultSet resultSet = null ;
@@ -55,13 +55,13 @@ public class ModResultsIn implements Arg
// Guess format
if ( resultsFilename != null )
- inputFormat = ResultSetFormat.guessSyntax(resultsFilename) ;
+ inputFormat = ResultFormat.guessSyntax(resultsFilename) ;
// Set format
if ( cmdline.contains(resultsInputFmtDecl) )
{
String rFmt = cmdline.getValue(resultsInputFmtDecl) ;
- inputFormat = ResultSetFormat.lookup(rFmt) ;
+ inputFormat = ResultFormat.lookup(rFmt) ;
if ( inputFormat == null )
cmdline.cmdError("Unrecognized output format: "+rFmt) ;
}
@@ -115,7 +115,7 @@ public class ModResultsIn implements Arg
}
- public ResultSetFormat getInputFormat() { return inputFormat ; }
+ public ResultFormat getInputFormat() { return inputFormat ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/arq/cmdline/ModResultsOut.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/arq/cmdline/ModResultsOut.java?rev=1157556&r1=1157555&r2=1157556&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/arq/cmdline/ModResultsOut.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/arq/cmdline/ModResultsOut.java Sun Aug 14 16:20:17 2011
@@ -9,7 +9,7 @@ package arq.cmdline;
import com.hp.hpl.jena.query.ResultSet ;
import com.hp.hpl.jena.sparql.core.Prologue ;
-import com.hp.hpl.jena.sparql.resultset.ResultsFormat ;
+import com.hp.hpl.jena.sparql.resultset.ResultFormat ;
import com.hp.hpl.jena.sparql.util.QueryExecUtils ;
public class ModResultsOut implements ArgModuleGeneral
@@ -17,14 +17,14 @@ public class ModResultsOut implements Ar
protected final
ArgDecl resultsFmtDecl = new ArgDecl(ArgDecl.HasValue, "results", "out", "rfmt") ;
- private ResultsFormat resultsFormat = ResultsFormat.FMT_UNKNOWN ;
+ private ResultFormat resultsFormat = ResultFormat.FMT_UNKNOWN ;
public void processArgs(CmdArgModule cmdline) throws IllegalArgumentException
{
if ( cmdline.contains(resultsFmtDecl) )
{
String rFmt = cmdline.getValue(resultsFmtDecl) ;
- resultsFormat = ResultsFormat.lookup(rFmt) ;
+ resultsFormat = ResultFormat.lookup(rFmt) ;
if ( resultsFormat == null )
cmdline.cmdError("Unrecognized output format: "+rFmt) ;
}
@@ -46,7 +46,7 @@ public class ModResultsOut implements Ar
QueryExecUtils.outputResultSet(resultSet, prologue, resultsFormat) ;
}
- public ResultsFormat getResultsFormat() { return resultsFormat ; }
+ public ResultFormat getResultsFormat() { return resultsFormat ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/arq/query.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/arq/query.java?rev=1157556&r1=1157555&r2=1157556&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/arq/query.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/arq/query.java Sun Aug 14 16:20:17 2011
@@ -28,7 +28,7 @@ import com.hp.hpl.jena.shared.JenaExcept
import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
import com.hp.hpl.jena.sparql.mgt.Explain ;
import com.hp.hpl.jena.sparql.resultset.ResultSetException ;
-import com.hp.hpl.jena.sparql.resultset.ResultsFormat ;
+import com.hp.hpl.jena.sparql.resultset.ResultFormat ;
import com.hp.hpl.jena.sparql.util.QueryExecUtils ;
import com.hp.hpl.jena.sparql.util.Utils ;
@@ -126,7 +126,7 @@ public class query extends CmdARQ
// Warm up.
for ( int i = 0 ; i < warmupCount ; i++ )
{
- queryExec(false, ResultsFormat.FMT_NONE) ;
+ queryExec(false, ResultFormat.FMT_NONE) ;
}
for ( int i = 0 ; i < repeatCount ; i++ )
@@ -149,7 +149,7 @@ public class query extends CmdARQ
protected Dataset getDataset() { return modDataset.getDataset() ; }
protected long totalTime = 0 ;
- protected void queryExec(boolean timed, ResultsFormat fmt)
+ protected void queryExec(boolean timed, ResultFormat fmt)
{
try{
Query query = modQuery.getQuery() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/BIOInput.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/BIOInput.java?rev=1157556&r1=1157555&r2=1157556&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/BIOInput.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/BIOInput.java Sun Aug 14 16:20:17 2011
@@ -37,7 +37,9 @@ public class BIOInput
public static ResultSet fromBIO(InputStream input)
{
- // Scan the stream for VARS an accumulate the totol variables.
+ // Scan the stream for VARS and accumulate the total variables.
+ // Trade off of guessing first line is all the VARS and coping with
+ // anything possible. -> Cope with anything possible.
BindingInputStream bin = new BindingInputStream(input) ;
List<Binding> bindings = new ArrayList<Binding>() ;
List<Var> vars = new ArrayList<Var>() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/ResultSetFactory.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/ResultSetFactory.java?rev=1157556&r1=1157555&r2=1157556&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/ResultSetFactory.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/ResultSetFactory.java Sun Aug 14 16:20:17 2011
@@ -42,18 +42,18 @@ public class ResultSetFactory
* @return ResultSet
*/
- public static ResultSet load(String filenameOrURI, ResultSetFormat format)
+ public static ResultSet load(String filenameOrURI, ResultFormat format)
{
if ( format == null )
- format = ResultSetFormat.guessSyntax(filenameOrURI) ;
+ format = ResultFormat.guessSyntax(filenameOrURI) ;
if ( format == null )
{
Log.warn(ResultSet.class, "Null format - defaulting to XML") ;
- format = ResultSetFormat.syntaxXML ;
+ format = ResultFormat.FMT_RS_XML ;
}
- if ( format.equals(ResultSetFormat.syntaxText) )
+ if ( format.equals(ResultFormat.FMT_TEXT) )
{
Log.fatal(ResultSet.class, "Can't read a text result set") ;
throw new ResultSetException("Can't read a text result set") ;
@@ -71,60 +71,61 @@ public class ResultSetFactory
* @return ResultSet
*/
- public static ResultSet load(InputStream input, ResultSetFormat format)
+ public static ResultSet load(InputStream input, ResultFormat format)
{
if ( format == null )
{
Log.warn(ResultSet.class, "Null format - defaulting to XML") ;
- format = ResultSetFormat.syntaxXML ;
+ format = ResultFormat.FMT_RS_XML ;
}
- if ( format.equals(ResultSetFormat.syntaxText) )
+ if ( format.equals(ResultFormat.FMT_RS_JSON) )
+ return JSONInput.fromJSON(input) ;
+
+ if ( format.equals(ResultFormat.FMT_RS_TSV) )
+ return TSVInput.fromTSV(input) ;
+
+ if ( format.equals(ResultFormat.FMT_RS_BIO) )
+ return BIOInput.fromBIO(input) ;
+
+ if ( format.equals(ResultFormat.FMT_RS_XML) )
+ return ResultSetFactory.fromXML(input) ;
+
+ if ( format.equals(ResultFormat.FMT_TEXT) )
{
Log.warn(ResultSet.class, "Can't read a text result set") ;
throw new ResultSetException("Can't read a text result set") ;
}
- if ( format.equals(ResultSetFormat.syntaxXML) )
- return ResultSetFactory.fromXML(input) ;
- if ( format.equals(ResultSetFormat.syntaxRDF_XML) )
+ if ( format.equals(ResultFormat.FMT_RDF_XML) )
{
Model m = ModelFactory.createDefaultModel() ;
m.read(input, null) ;
return ResultSetFactory.fromRDF(m) ;
}
- if ( format.equals(ResultSetFormat.syntaxRDF_TURTLE) )
+ if ( format.equals(ResultFormat.FMT_RDF_TTL) )
{
Model m = ModelFactory.createDefaultModel() ;
m.read(input, null, "TURTLE") ;
return ResultSetFactory.fromRDF(m) ;
}
- if ( format.equals(ResultSetFormat.syntaxRDF_N3) )
+ if ( format.equals(ResultFormat.FMT_RDF_N3) )
{
Model m = ModelFactory.createDefaultModel() ;
m.read(input, null, "N3") ;
return ResultSetFactory.fromRDF(m) ;
}
- if ( format.equals(ResultSetFormat.syntaxJSON) )
- {
- // Only ResultSets
- return JSONInput.fromJSON(input) ;
- }
-
- if ( format.equals(ResultSetFormat.syntaxTSV) )
- {
- return TSVInput.fromTSV(input) ;
- }
-
- if ( format.equals(ResultSetFormat.syntaxBIO) )
+ if ( format.equals(ResultFormat.FMT_RDF_NT) )
{
- return BIOInput.fromBIO(input) ;
+ Model m = ModelFactory.createDefaultModel() ;
+ m.read(input, null, "N-TRIPLES") ;
+ return ResultSetFactory.fromRDF(m) ;
}
-
+
Log.warn(ResultSet.class, "Unknown result set syntax: "+format) ;
return null ;
@@ -156,7 +157,7 @@ public class ResultSetFactory
* @return Model
*/
- public static Model loadAsModel(String filenameOrURI, ResultSetFormat format)
+ public static Model loadAsModel(String filenameOrURI, ResultFormat format)
{ return loadAsModel(null, filenameOrURI, format) ; }
/** Load a result set (or any other model) from file or URL.
@@ -168,27 +169,27 @@ public class ResultSetFactory
* @return Model
*/
- public static Model loadAsModel(Model model, String filenameOrURI, ResultSetFormat format)
+ public static Model loadAsModel(Model model, String filenameOrURI, ResultFormat format)
{
if ( model == null )
model = GraphFactory.makeDefaultModel() ;
if ( format == null )
- format = ResultSetFormat.guessSyntax(filenameOrURI) ;
+ format = ResultFormat.guessSyntax(filenameOrURI) ;
if ( format == null )
{
Log.warn(ResultSet.class, "Null format - defaulting to XML") ;
- format = ResultSetFormat.syntaxXML ;
+ format = ResultFormat.FMT_RS_XML ;
}
- if ( format.equals(ResultSetFormat.syntaxText) )
+ if ( format.equals(ResultFormat.FMT_TEXT) )
{
Log.fatal(ResultSet.class, "Can't read a text result set") ;
throw new ResultSetException("Can't read a text result set") ;
}
- if ( format.equals(ResultSetFormat.syntaxXML) || format.equals(ResultSetFormat.syntaxJSON))
+ if ( format.equals(ResultFormat.FMT_RS_XML) || format.equals(ResultFormat.FMT_RS_JSON))
{
InputStream in = null ;
try {
@@ -200,7 +201,7 @@ public class ResultSetFactory
SPARQLResult x = null ;
- if ( format.equals(ResultSetFormat.syntaxJSON) )
+ if ( format.equals(ResultFormat.FMT_RS_JSON) )
x = JSONInput.make(in, GraphFactory.makeDefaultModel()) ;
else
x = XMLInput.make(in, GraphFactory.makeDefaultModel()) ;
@@ -213,7 +214,7 @@ public class ResultSetFactory
return model ;
}
- if ( format.isRDFGraphSyntax() )
+ if ( ResultFormat.isRDFGraphSyntax(format) )
return FileManager.get().readModel(model, filenameOrURI) ;
Log.fatal(ResultSet.class, "Unknown result set syntax: "+format) ;
@@ -233,24 +234,24 @@ public class ResultSetFactory
* Read in any kind of result kind (result set, boolean, graph)
*/
- public static SPARQLResult result(String filenameOrURI, ResultSetFormat format)
+ public static SPARQLResult result(String filenameOrURI, ResultFormat format)
{
if ( format == null )
- format = ResultSetFormat.guessSyntax(filenameOrURI) ;
+ format = ResultFormat.guessSyntax(filenameOrURI) ;
if ( format == null )
{
Log.warn(ResultSet.class, "Null format - defaulting to XML") ;
- format = ResultSetFormat.syntaxXML ;
+ format = ResultFormat.FMT_RS_XML ;
}
- if ( format.equals(ResultSetFormat.syntaxText) )
+ if ( format.equals(ResultFormat.FMT_TEXT) )
{
Log.fatal(ResultSet.class, "Can't read a text result set") ;
throw new ResultSetException("Can't read a text result set") ;
}
- if ( format.equals(ResultSetFormat.syntaxXML) || format.equals(ResultSetFormat.syntaxJSON) || format.equals(ResultSetFormat.syntaxTSV) )
+ if ( format.equals(ResultFormat.FMT_RS_XML) || format.equals(ResultFormat.FMT_RS_JSON) || format.equals(ResultFormat.FMT_RS_TSV) )
{
InputStream in = null ;
try {
@@ -262,16 +263,16 @@ public class ResultSetFactory
SPARQLResult x = null ;
- if ( format.equals(ResultSetFormat.syntaxJSON) )
+ if ( format.equals(ResultFormat.FMT_RS_JSON) )
return JSONInput.make(in, GraphFactory.makeDefaultModel()) ;
- else if ( format.equals(ResultSetFormat.syntaxXML) )
+ else if ( format.equals(ResultFormat.FMT_RS_XML) )
return XMLInput.make(in, GraphFactory.makeDefaultModel()) ;
- else if ( format.equals(ResultSetFormat.syntaxTSV) )
+ else if ( format.equals(ResultFormat.FMT_RS_TSV) )
{
ResultSet rs = TSVInput.fromTSV(in) ;
return new SPARQLResult(rs) ;
}
- else if ( format.equals(ResultSetFormat.syntaxBIO) )
+ else if ( format.equals(ResultFormat.FMT_RS_BIO) )
{
ResultSet rs = BIOInput.fromBIO(in) ;
return new SPARQLResult(rs) ;
@@ -279,7 +280,7 @@ public class ResultSetFactory
}
}
- if ( format.isRDFGraphSyntax() )
+ if ( ResultFormat.isRDFGraphSyntax(format) )
{
Model model = FileManager.get().loadModel(filenameOrURI) ;
return new SPARQLResult(model) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/ResultSetFormatter.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/ResultSetFormatter.java?rev=1157556&r1=1157555&r2=1157556&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/ResultSetFormatter.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/ResultSetFormatter.java Sun Aug 14 16:20:17 2011
@@ -8,7 +8,6 @@ package com.hp.hpl.jena.query;
import java.io.ByteArrayOutputStream ;
import java.io.OutputStream ;
-import java.io.PrintStream ;
import java.io.PrintWriter ;
import java.io.UnsupportedEncodingException ;
import java.util.ArrayList ;
@@ -30,7 +29,7 @@ import com.hp.hpl.jena.sparql.engine.bin
import com.hp.hpl.jena.sparql.resultset.CSVOutput ;
import com.hp.hpl.jena.sparql.resultset.JSONOutput ;
import com.hp.hpl.jena.sparql.resultset.RDFOutput ;
-import com.hp.hpl.jena.sparql.resultset.ResultSetFormat ;
+import com.hp.hpl.jena.sparql.resultset.ResultFormat ;
import com.hp.hpl.jena.sparql.resultset.TSVOutput ;
import com.hp.hpl.jena.sparql.resultset.TextOutput ;
import com.hp.hpl.jena.sparql.resultset.XMLOutput ;
@@ -280,7 +279,7 @@ public class ResultSetFormatter
* @param rFmt A format to encode the result set in
*/
- static public void output(ResultSet resultSet, ResultSetFormat rFmt)
+ static public void output(ResultSet resultSet, ResultFormat rFmt)
{ output(System.out, resultSet, rFmt) ; }
/** Output a ResultSet in some format.
@@ -291,32 +290,61 @@ public class ResultSetFormatter
* @param rFmt A format to encode the result set in
*/
- static public void output(OutputStream outStream, ResultSet resultSet, ResultSetFormat rFmt)
+ static public void output(OutputStream outStream, ResultSet resultSet, ResultFormat rFmt)
{
- if ( rFmt.equals(ResultSetFormat.syntaxXML) )
+ if ( rFmt.equals(ResultFormat.FMT_RS_XML) )
{
outputAsXML(outStream, resultSet) ;
return ;
}
- if ( rFmt.equals(ResultSetFormat.syntaxText) )
+ if ( rFmt.equals(ResultFormat.FMT_RS_JSON) )
{
- out(outStream, resultSet) ;
+ outputAsJSON(outStream, resultSet) ;
+ return ;
+ }
+
+ if ( rFmt.equals(ResultFormat.FMT_RS_CSV) )
+ {
+ outputAsCSV(outStream, resultSet);
+ return ;
+ }
+
+ if ( rFmt.equals(ResultFormat.FMT_RS_TSV) )
+ {
+ outputAsTSV(outStream, resultSet);
+ return ;
+ }
+
+ if ( rFmt.equals(ResultFormat.FMT_RS_BIO) )
+ {
+ outputAsBIO(outStream, resultSet);
return ;
}
- if ( rFmt.equals(ResultSetFormat.syntaxJSON) )
+ if ( rFmt.equals(ResultFormat.FMT_RS_JSON) )
{
outputAsJSON(outStream, resultSet) ;
return ;
}
-
- if ( rFmt.equals(ResultSetFormat.syntaxRDF_XML) )
+
+ if ( rFmt.equals(ResultFormat.FMT_RDF_XML) )
{
outputAsRDF(outStream, "RDF/XML-ABBREV", resultSet) ;
return ;
}
+ if ( rFmt.equals(ResultFormat.FMT_RDF_TTL) )
+ {
+ outputAsRDF(outStream, "TTL", resultSet) ;
+ return ;
+ }
+
+ if ( rFmt.equals(ResultFormat.FMT_RDF_NT) )
+ {
+ outputAsRDF(outStream, "N-TRIPLES", resultSet) ;
+ return ;
+ }
Log.warn(ResultSetFormatter.class, "Unknown ResultSetFormat: "+rFmt);
}
@@ -721,7 +749,7 @@ public class ResultSetFormatter
}
/** Output a result set in BIO format */
- public static void outputAsBIO(PrintStream out, ResultSet results)
+ public static void outputAsBIO(OutputStream out, ResultSet results)
{
List<Var> vars = Var.varList(results.getResultVars()) ;
Copied: incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/resultset/ResultFormat.java (from r1157415, incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/resultset/ResultSetFormat.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/resultset/ResultFormat.java?p2=incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/resultset/ResultFormat.java&p1=incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/resultset/ResultSetFormat.java&r1=1157415&r2=1157556&rev=1157556&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/resultset/ResultSetFormat.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/resultset/ResultFormat.java Sun Aug 14 16:20:17 2011
@@ -1,144 +1,124 @@
/*
* (c) Copyright 2005, 2006, 2007, 2008, 2009 Hewlett-Packard Development Company, LP
+ * (c) Copyright 2011 Epimorphics Ltd.
* All rights reserved.
* [See end of file]
*/
package com.hp.hpl.jena.sparql.resultset;
-import com.hp.hpl.jena.sparql.util.Symbol ;
import com.hp.hpl.jena.sparql.util.TranslationTable ;
-public class ResultSetFormat extends Symbol
-{
- public static final ResultSetFormat syntaxXML = new ResultSetFormat("RS_XML") ;
+public enum ResultFormat
+{
+ // 1 - enum? (this code predates Java 1.5 and enums!)
+ // 2 - merge with out system wide naming (WebContent?)
+ FMT_RS_XML , FMT_RS_JSON , FMT_RS_CSV , FMT_RS_TSV , FMT_RS_SSE , FMT_RS_BIO ,
+ FMT_NONE , FMT_TEXT , FMT_TUPLES , FMT_COUNT ,
+ FMT_RS_RDF , FMT_RDF_XML , FMT_RDF_N3 , FMT_RDF_TTL , FMT_RDF_TURTLE , FMT_RDF_NT ,
+ FMT_UNKNOWN ;
- // general RDF
- public static final ResultSetFormat syntaxRDF_XML = new ResultSetFormat("RS_RDF") ;
-
- // Specific RDF serialization
- public static final ResultSetFormat syntaxRDF_N3 = new ResultSetFormat("RS_RDF/N3") ;
-// public static final ResultSetFormat syntaxRDF_TTL = new ResultSetFormat("RS_RDF/TTL") ;
- public static final ResultSetFormat syntaxRDF_TURTLE = new ResultSetFormat("RS_RDF/TTL") ;
- public static final ResultSetFormat syntaxRDF_NT = new ResultSetFormat("RS_RDF/NT") ;
-
- public static final ResultSetFormat syntaxText = new ResultSetFormat("RS_TEXT") ;
- public static final ResultSetFormat syntaxJSON = new ResultSetFormat("RS_JSON") ;
-
- public static final ResultSetFormat syntaxSSE = new ResultSetFormat("RS_SSE") ;
- public static final ResultSetFormat syntaxCSV = new ResultSetFormat("RS_CSV") ;
- public static final ResultSetFormat syntaxTSV = new ResultSetFormat("RS_TSV") ;
- public static final ResultSetFormat syntaxBIO = new ResultSetFormat("RS_BIO") ;
-
// Common names to symbol (used by arq.rset)
- protected static TranslationTable<ResultSetFormat> syntaxNames = new TranslationTable<ResultSetFormat>(true) ;
+ private static TranslationTable<ResultFormat> names = new TranslationTable<ResultFormat>(true) ;
static {
- syntaxNames.put("srx", syntaxXML) ;
- syntaxNames.put("xml", syntaxXML) ;
- syntaxNames.put("rdf", syntaxRDF_XML) ;
- syntaxNames.put("rdf/n3", syntaxRDF_N3) ;
- syntaxNames.put("rdf/xml", syntaxRDF_XML) ;
- syntaxNames.put("n3", syntaxRDF_N3) ;
- syntaxNames.put("ttl", syntaxRDF_TURTLE) ;
- syntaxNames.put("turtle", syntaxRDF_TURTLE) ;
- syntaxNames.put("text", syntaxText) ;
- syntaxNames.put("json", syntaxJSON) ;
- syntaxNames.put("yaml", syntaxJSON) ; // The JSON format is a subset of YAML
- syntaxNames.put("sse", syntaxSSE) ;
- syntaxNames.put("csv", syntaxCSV) ;
- syntaxNames.put("tsv", syntaxTSV) ;
- syntaxNames.put("srb", syntaxBIO) ;
- }
+ names.put("srx", FMT_RS_XML) ;
+ names.put("xml", FMT_RS_XML) ;
+
+ names.put("json", FMT_RS_JSON) ;
+ names.put("yaml", FMT_RS_JSON) ; // The JSON format is a subset of YAML
+ names.put("sse", FMT_RS_SSE) ;
+ names.put("csv", FMT_RS_CSV) ;
+ names.put("tsv", FMT_RS_TSV) ;
+ names.put("srb", FMT_RS_BIO) ;
+ names.put("text", FMT_TEXT) ;
+ names.put("count", FMT_COUNT) ;
+ names.put("tuples", FMT_TUPLES) ;
+ names.put("none", FMT_NONE) ;
+
+
+ names.put("rdf", FMT_RDF_XML) ;
+ names.put("rdf/n3", FMT_RDF_N3) ;
+ names.put("rdf/xml", FMT_RDF_XML) ;
+ names.put("n3", FMT_RDF_N3) ;
+ names.put("ttl", FMT_RDF_TTL) ;
+ names.put("turtle", FMT_RDF_TTL) ;
+ names.put("graph", FMT_RDF_TTL) ;
+ names.put("nt", FMT_RDF_NT) ;
+ names.put("n-triples", FMT_RDF_NT) ;
- protected ResultSetFormat(String symbol) { super(symbol) ; }
- protected ResultSetFormat(ResultSetFormat fmt) { super(fmt) ; }
-
-
- public static ResultSetFormat guessSyntax(String url)
- {
- return guessSyntax(url, syntaxXML) ;
}
-
-// public boolean isCompatibleWith(ResultSetFormat other)
-// {
-// if ( equals(other) )
-// return true ;
-// if ( other.equals(syntaxRDF_XML) &&
-// ( equals(syntaxRDF_N3) || equals(syntaxRDF_TURTLE) || equals(syntaxRDF_NT) ) )
-// return true ;
-// return false ;
-// }
- public boolean isRDFGraphSyntax()
+ public static ResultFormat guessSyntax(String url)
{
- return isRDFGraphSyntax(this) ;
+ return guessSyntax(url, FMT_RS_XML) ;
}
- public static boolean isRDFGraphSyntax(ResultSetFormat fmt)
+ public static boolean isRDFGraphSyntax(ResultFormat fmt)
{
- if ( syntaxRDF_N3.equals(fmt) ) return true ;
- if ( syntaxRDF_TURTLE.equals(fmt) ) return true ;
- if ( syntaxRDF_XML.equals(fmt) ) return true ;
+ if ( FMT_RDF_N3.equals(fmt) ) return true ;
+ if ( FMT_RDF_TURTLE.equals(fmt) ) return true ;
+ if ( FMT_RDF_XML.equals(fmt) ) return true ;
+ if ( FMT_RDF_NT.equals(fmt) ) return true ;
return false ;
}
-
- public static ResultSetFormat guessSyntax(String url, ResultSetFormat defaultFormat)
+ public static ResultFormat guessSyntax(String url, ResultFormat defaultFormat)
{
// -- XML
if ( url.endsWith(".srx") )
- return syntaxXML ;
+ return FMT_RS_XML ;
if ( url.endsWith(".xml") )
- return syntaxXML ;
+ return FMT_RS_XML ;
// -- Some kind of RDF
if ( url.endsWith(".rdf") )
- return syntaxRDF_XML ;
+ return FMT_RDF_XML ;
if ( url.endsWith(".n3") )
- return syntaxRDF_N3 ;
+ return FMT_RDF_N3 ;
if ( url.endsWith(".ttl") )
- return syntaxRDF_TURTLE ;
+ return FMT_RDF_TURTLE ;
// -- JSON
if ( url.endsWith(".srj") )
- return syntaxJSON ;
+ return FMT_RS_JSON ;
if ( url.endsWith(".json") )
- return syntaxJSON ;
+ return FMT_RS_JSON ;
if ( url.endsWith(".yml") )
- return syntaxJSON ;
+ return FMT_RS_JSON ;
// -- SSE : http://openjena.org/wiki/SSE
if ( url.endsWith(".sse") )
- return syntaxSSE ;
+ return FMT_RS_SSE ;
if ( url.endsWith(".srb") ) // BindingsIO format.
- return syntaxBIO ;
+ return FMT_RS_BIO ;
// Likely to be something completely different!
if ( url.endsWith(".csv") )
- return syntaxCSV ;
+ return FMT_RS_CSV ;
if ( url.endsWith(".tsv") )
- return syntaxTSV ;
+ return FMT_RS_TSV ;
return defaultFormat ;
}
- /** Look up a short name for a result set syntax
+ /** Look up a short name for a result set FMT_
*
* @param s Short name
* @return ResultSetFormat
*/
- public static ResultSetFormat lookup(String s)
+ public static ResultFormat lookup(String s)
{
- return syntaxNames.lookup(s) ;
+ return names.lookup(s) ;
}
}
/*
* (c) Copyright 2005, 2006, 2007, 2008, 2009 Hewlett-Packard Development Company, LP
+ * (c) Copyright 2011 Epimorphics Ltd.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/sse/builders/BuilderExec.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/sse/builders/BuilderExec.java?rev=1157556&r1=1157555&r2=1157556&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/sse/builders/BuilderExec.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/sse/builders/BuilderExec.java Sun Aug 14 16:20:17 2011
@@ -8,7 +8,7 @@ package com.hp.hpl.jena.sparql.sse.build
import com.hp.hpl.jena.sparql.algebra.Op ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.sparql.resultset.ResultsFormat ;
+import com.hp.hpl.jena.sparql.resultset.ResultFormat ;
import com.hp.hpl.jena.sparql.sse.Item ;
import com.hp.hpl.jena.sparql.sse.ItemList ;
import com.hp.hpl.jena.sparql.sse.SSE ;
@@ -39,7 +39,7 @@ public class BuilderExec
DatasetGraph dsg = BuilderGraph.buildDataset(list.get(1)) ;
Op op = BuilderOp.build(list.get(2)) ;
- QueryExecUtils.executeAlgebra(op, dsg, ResultsFormat.FMT_TEXT) ;
+ QueryExecUtils.executeAlgebra(op, dsg, ResultFormat.FMT_TEXT) ;
}
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/util/QueryExecUtils.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/util/QueryExecUtils.java?rev=1157556&r1=1157555&r2=1157556&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/util/QueryExecUtils.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/util/QueryExecUtils.java Sun Aug 14 16:20:17 2011
@@ -9,7 +9,16 @@ package com.hp.hpl.jena.sparql.util;
import java.util.List ;
-import com.hp.hpl.jena.query.* ;
+import com.hp.hpl.jena.query.Dataset ;
+import com.hp.hpl.jena.query.DatasetFactory ;
+import com.hp.hpl.jena.query.Query ;
+import com.hp.hpl.jena.query.QueryExecution ;
+import com.hp.hpl.jena.query.QueryExecutionFactory ;
+import com.hp.hpl.jena.query.QueryFactory ;
+import com.hp.hpl.jena.query.QuerySolution ;
+import com.hp.hpl.jena.query.ResultSet ;
+import com.hp.hpl.jena.query.ResultSetFactory ;
+import com.hp.hpl.jena.query.ResultSetFormatter ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.RDFNode ;
import com.hp.hpl.jena.rdf.model.RDFWriter ;
@@ -27,7 +36,7 @@ import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.sparql.engine.QueryIterator ;
import com.hp.hpl.jena.sparql.resultset.PlainFormat ;
import com.hp.hpl.jena.sparql.resultset.ResultSetApply ;
-import com.hp.hpl.jena.sparql.resultset.ResultsFormat ;
+import com.hp.hpl.jena.sparql.resultset.ResultFormat ;
import com.hp.hpl.jena.sparql.vocabulary.ResultSetGraphVocab ;
/** Some utilities for query processing. */
@@ -45,10 +54,10 @@ public class QueryExecUtils
public static void executeQuery(Query query, QueryExecution queryExecution)
{
- executeQuery(query, queryExecution, ResultsFormat.FMT_TEXT) ;
+ executeQuery(query, queryExecution, ResultFormat.FMT_TEXT) ;
}
- public static void executeQuery(Query query, QueryExecution queryExecution, ResultsFormat outputFormat)
+ public static void executeQuery(Query query, QueryExecution queryExecution, ResultFormat outputFormat)
{
if ( query.isSelectType() )
doSelectQuery(query, queryExecution, outputFormat) ;
@@ -61,7 +70,7 @@ public class QueryExecUtils
queryExecution.close() ;
}
- public static void executeAlgebra(Op op, DatasetGraph dsg, ResultsFormat outputFormat)
+ public static void executeAlgebra(Op op, DatasetGraph dsg, ResultFormat outputFormat)
{
QueryIterator qIter = Algebra.exec(op, dsg) ;
@@ -76,29 +85,29 @@ public class QueryExecUtils
outputResultSet(results, null, outputFormat) ;
}
- public static void outputResultSet(ResultSet results, Prologue prologue, ResultsFormat outputFormat)
+ public static void outputResultSet(ResultSet results, Prologue prologue, ResultFormat outputFormat)
{
boolean done = false ;
if ( prologue == null )
prologue = new Prologue(globalPrefixMap) ;
- if ( outputFormat.equals(ResultsFormat.FMT_UNKNOWN) )
- outputFormat = ResultsFormat.FMT_TEXT ;
+ if ( outputFormat.equals(ResultFormat.FMT_UNKNOWN) )
+ outputFormat = ResultFormat.FMT_TEXT ;
- if ( outputFormat.equals(ResultsFormat.FMT_NONE) ||
- outputFormat.equals(ResultsFormat.FMT_COUNT) )
+ if ( outputFormat.equals(ResultFormat.FMT_NONE) ||
+ outputFormat.equals(ResultFormat.FMT_COUNT) )
{
int count = ResultSetFormatter.consume(results) ;
- if ( outputFormat.equals(ResultsFormat.FMT_COUNT) )
+ if ( outputFormat.equals(ResultFormat.FMT_COUNT) )
{
System.out.println("Count = "+count) ;
}
done = true ;
}
- if ( outputFormat.equals(ResultsFormat.FMT_RS_RDF) ||
- outputFormat.equals(ResultsFormat.FMT_RDF_N3) ||
- outputFormat.equals(ResultsFormat.FMT_RDF_TTL) )
+ if ( outputFormat.equals(ResultFormat.FMT_RS_RDF) ||
+ outputFormat.equals(ResultFormat.FMT_RDF_N3) ||
+ outputFormat.equals(ResultFormat.FMT_RDF_TTL) )
{
Model m = ResultSetFormatter.toModel(results) ;
m.setNsPrefixes(prologue.getPrefixMapping()) ;
@@ -108,31 +117,31 @@ public class QueryExecUtils
done = true ;
}
- if ( outputFormat.equals(ResultsFormat.FMT_RS_XML) )
+ if ( outputFormat.equals(ResultFormat.FMT_RS_XML) )
{
ResultSetFormatter.outputAsXML(System.out, results) ;
done = true ;
}
- if ( outputFormat.equals(ResultsFormat.FMT_RS_JSON) )
+ if ( outputFormat.equals(ResultFormat.FMT_RS_JSON) )
{
ResultSetFormatter.outputAsJSON(System.out, results) ;
done = true ;
}
- if ( outputFormat.equals(ResultsFormat.FMT_RS_SSE) )
+ if ( outputFormat.equals(ResultFormat.FMT_RS_SSE) )
{
ResultSetFormatter.outputAsSSE(System.out, results, prologue) ;
done = true ;
}
- if ( outputFormat.equals(ResultsFormat.FMT_TEXT) )
+ if ( outputFormat.equals(ResultFormat.FMT_TEXT) )
{
ResultSetFormatter.out(System.out, results, prologue) ;
done = true ;
}
- if ( outputFormat.equals(ResultsFormat.FMT_TUPLES) )
+ if ( outputFormat.equals(ResultFormat.FMT_TUPLES) )
{
PlainFormat pFmt = new PlainFormat(System.out, prologue) ;
ResultSetApply a = new ResultSetApply(results, pFmt) ;
@@ -140,19 +149,19 @@ public class QueryExecUtils
done = true ;
}
- if ( outputFormat.equals(ResultsFormat.FMT_RS_CSV ) )
+ if ( outputFormat.equals(ResultFormat.FMT_RS_CSV ) )
{
ResultSetFormatter.outputAsCSV(System.out, results) ;
done = true ;
}
- if ( outputFormat.equals(ResultsFormat.FMT_RS_TSV ) )
+ if ( outputFormat.equals(ResultFormat.FMT_RS_TSV ) )
{
ResultSetFormatter.outputAsTSV(System.out, results) ;
done = true ;
}
- if ( outputFormat.equals(ResultsFormat.FMT_RS_BIO ) )
+ if ( outputFormat.equals(ResultFormat.FMT_RS_BIO ) )
{
ResultSetFormatter.outputAsBIO(System.out, results) ;
done = true ;
@@ -165,43 +174,43 @@ public class QueryExecUtils
System.out.flush() ;
}
- private static void doSelectQuery(Query query, QueryExecution qe, ResultsFormat outputFormat)
+ private static void doSelectQuery(Query query, QueryExecution qe, ResultFormat outputFormat)
{
- if ( outputFormat == null || outputFormat == ResultsFormat.FMT_UNKNOWN )
- outputFormat = ResultsFormat.FMT_TEXT ;
+ if ( outputFormat == null || outputFormat == ResultFormat.FMT_UNKNOWN )
+ outputFormat = ResultFormat.FMT_TEXT ;
ResultSet results = qe.execSelect() ;
outputResultSet(results, query, outputFormat) ;
}
- private static void doDescribeQuery(Query query, QueryExecution qe, ResultsFormat outputFormat)
+ private static void doDescribeQuery(Query query, QueryExecution qe, ResultFormat outputFormat)
{
- if ( outputFormat == null || outputFormat == ResultsFormat.FMT_UNKNOWN )
- outputFormat = ResultsFormat.FMT_RDF_TTL ;
+ if ( outputFormat == null || outputFormat == ResultFormat.FMT_UNKNOWN )
+ outputFormat = ResultFormat.FMT_RDF_TTL ;
Model r = qe.execDescribe() ;
writeModel(query, r, outputFormat) ;
}
- private static void doConstructQuery(Query query, QueryExecution qe, ResultsFormat outputFormat)
+ private static void doConstructQuery(Query query, QueryExecution qe, ResultFormat outputFormat)
{
- if ( outputFormat == null || outputFormat == ResultsFormat.FMT_UNKNOWN )
- outputFormat = ResultsFormat.FMT_RDF_TTL ;
+ if ( outputFormat == null || outputFormat == ResultFormat.FMT_UNKNOWN )
+ outputFormat = ResultFormat.FMT_RDF_TTL ;
Model r = qe.execConstruct() ;
writeModel(query, r, outputFormat) ;
}
- private static void writeModel(Query query, Model model, ResultsFormat outputFormat)
+ private static void writeModel(Query query, Model model, ResultFormat outputFormat)
{
- if ( outputFormat == null || outputFormat == ResultsFormat.FMT_UNKNOWN )
- outputFormat = ResultsFormat.FMT_TEXT ;
+ if ( outputFormat == null || outputFormat == ResultFormat.FMT_UNKNOWN )
+ outputFormat = ResultFormat.FMT_TEXT ;
- if ( outputFormat.equals(ResultsFormat.FMT_NONE) )
+ if ( outputFormat.equals(ResultFormat.FMT_NONE) )
return ;
- if ( outputFormat.equals(ResultsFormat.FMT_TEXT))
+ if ( outputFormat.equals(ResultFormat.FMT_TEXT))
{
String qType = "" ;
if ( query.isDescribeType() ) qType = "DESCRIBE" ;
@@ -213,76 +222,74 @@ public class QueryExecUtils
return ;
}
- if ( outputFormat.equals(ResultsFormat.FMT_RDF_XML) )
+ if ( outputFormat.equals(ResultFormat.FMT_RDF_XML) )
{
model.write(System.out, "RDF/XML-ABBREV", null) ;
return ;
}
- if ( outputFormat.equals(ResultsFormat.FMT_RDF_TTL) )
+ if ( outputFormat.equals(ResultFormat.FMT_RDF_TTL) )
{
model.write(System.out, "N3", null) ;
return ;
}
- if ( outputFormat.equals(ResultsFormat.FMT_RDF_N3) )
+ if ( outputFormat.equals(ResultFormat.FMT_RDF_N3) )
{
model.write(System.out, "N3", null) ;
return ;
}
- if ( outputFormat.equals(ResultsFormat.FMT_RDF_NT) )
+ if ( outputFormat.equals(ResultFormat.FMT_RDF_NT) )
{
model.write(System.out, "N_TRIPLES", null) ;
return ;
}
- System.err.println("Unknown format: "+outputFormat.getSymbol()) ;
+ System.err.println("Unknown format: "+outputFormat) ;
}
- private static void doAskQuery(Query query, QueryExecution qe, ResultsFormat outputFormat)
+ private static void doAskQuery(Query query, QueryExecution qe, ResultFormat outputFormat)
{
boolean b = qe.execAsk() ;
- if ( outputFormat == null || outputFormat == ResultsFormat.FMT_UNKNOWN )
- outputFormat = ResultsFormat.FMT_TEXT ;
+ if ( outputFormat == null || outputFormat == ResultFormat.FMT_UNKNOWN )
+ outputFormat = ResultFormat.FMT_TEXT ;
- if ( outputFormat.equals(ResultsFormat.FMT_RS_XML) )
+ if ( outputFormat.equals(ResultFormat.FMT_RS_XML) )
{
ResultSetFormatter.outputAsXML(System.out, b) ;
return ;
}
- if ( outputFormat.equals(ResultsFormat.FMT_RDF_N3) ||
- outputFormat.equals(ResultsFormat.FMT_RDF_TTL) )
+ if ( outputFormat.equals(ResultFormat.FMT_RDF_N3) ||
+ outputFormat.equals(ResultFormat.FMT_RDF_TTL) )
{
ResultSetFormatter.outputAsRDF(System.out, "TURTLE", b) ;
System.out.flush() ;
return ;
}
- if ( outputFormat.equals(ResultsFormat.FMT_RS_JSON) )
+ if ( outputFormat.equals(ResultFormat.FMT_RS_JSON) )
{
ResultSetFormatter.outputAsJSON(System.out, b) ;
return ;
}
- if ( outputFormat.equals(ResultsFormat.FMT_TEXT) )
+ if ( outputFormat.equals(ResultFormat.FMT_TEXT) )
{
//ResultSetFormatter.out(System.out, b) ;
System.out.println("Ask => "+(b?"Yes":"No")) ;
return ;
}
- if ( outputFormat.equals(ResultsFormat.FMT_RS_CSV) )
+ if ( outputFormat.equals(ResultFormat.FMT_RS_CSV) )
{
ResultSetFormatter.outputAsCSV(System.out, b) ;
return ;
}
-
-
- System.err.println("Unknown format: "+outputFormat.getSymbol()) ;
+ System.err.println("Unknown format: "+outputFormat) ;
}
/** Execute a query, expecting the result to be one row, one column. Return that one RDFNode */
Modified: incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/util/TranslationTable.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/util/TranslationTable.java?rev=1157556&r1=1157555&r2=1157556&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/util/TranslationTable.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/util/TranslationTable.java Sun Aug 14 16:20:17 2011
@@ -14,7 +14,7 @@ import java.util.Map ;
/** Maps string to string for use with convenience names.
*/
-public class TranslationTable<X extends Symbol>
+public class TranslationTable<X>
{
Map<String, X> map = new HashMap<String, X>() ;
boolean ignoreCase = false ;
Modified: incubator/jena/Scratch/AFS/trunk/src-dev/dev/RunAFS.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/trunk/src-dev/dev/RunAFS.java?rev=1157556&r1=1157555&r2=1157556&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/trunk/src-dev/dev/RunAFS.java (original)
+++ incubator/jena/Scratch/AFS/trunk/src-dev/dev/RunAFS.java Sun Aug 14 16:20:17 2011
@@ -45,7 +45,7 @@ import com.hp.hpl.jena.iri.ViolationCode
import com.hp.hpl.jena.query.ResultSet ;
import com.hp.hpl.jena.query.ResultSetFactory ;
import com.hp.hpl.jena.query.ResultSetFormatter ;
-import com.hp.hpl.jena.sparql.resultset.ResultSetFormat ;
+import com.hp.hpl.jena.sparql.resultset.ResultFormat ;
import com.hp.hpl.jena.tdb.base.record.Record ;
public class RunAFS
@@ -77,7 +77,7 @@ public class RunAFS
public void handle(String contentType, String baseIRI, HttpResponse response) throws IOException
{
MediaType mt = new MediaType(contentType) ;
- ResultSetFormat fmt = contentTypeToResultSet(contentType) ;
+ ResultFormat fmt = contentTypeToResultSet(contentType) ;
InputStream in = response.getEntity().getContent() ;
rs = ResultSetFactory.load(in, fmt) ;
// Force reading
@@ -130,12 +130,12 @@ public class RunAFS
}
- public static ResultSetFormat contentTypeToResultSet(String contentType) { return mapContentTypeToResultSet.get(contentType) ; }
- static Map<String, ResultSetFormat> mapContentTypeToResultSet = new HashMap<String, ResultSetFormat>() ;
+ public static ResultFormat contentTypeToResultSet(String contentType) { return mapContentTypeToResultSet.get(contentType) ; }
+ static Map<String, ResultFormat> mapContentTypeToResultSet = new HashMap<String, ResultFormat>() ;
static {
- mapContentTypeToResultSet.put(WebContent.contentTypeResultsXML, ResultSetFormat.syntaxXML) ;
- mapContentTypeToResultSet.put(WebContent.contentTypeResultsJSON, ResultSetFormat.syntaxJSON) ;
- mapContentTypeToResultSet.put(WebContent.contentTypeTextTSV, ResultSetFormat.syntaxTSV) ;
+ mapContentTypeToResultSet.put(WebContent.contentTypeResultsXML, ResultFormat.FMT_RS_XML) ;
+ mapContentTypeToResultSet.put(WebContent.contentTypeResultsJSON, ResultFormat.FMT_RS_JSON) ;
+ mapContentTypeToResultSet.put(WebContent.contentTypeTextTSV, ResultFormat.FMT_RS_TSV) ;
}
static interface HttpCaptureResponse<T> extends HttpOp.HttpResponseHandler