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/16 12:35:06 UTC
svn commit: r1158189 - in /incubator/jena/Jena2/ARQ/trunk:
src-test/com/hp/hpl/jena/sparql/junit/
src-test/com/hp/hpl/jena/sparql/resultset/ src/arq/ src/arq/cmdline/
src/com/hp/hpl/jena/query/ src/com/hp/hpl/jena/sparql/engine/iterator/
src/com/hp/hpl...
Author: andy
Date: Tue Aug 16 10:35:05 2011
New Revision: 1158189
URL: http://svn.apache.org/viewvc?rev=1158189&view=rev
Log:
Better compatibility for ResultsFormat contants changes.
Added:
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/resultset/ResultsFormat.java
- copied, changed from r1157915, incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/resultset/ResultFormat.java
Removed:
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/resultset/ResultFormat.java
Modified:
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/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/engine/iterator/QueryIteratorBase.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/org/openjena/riot/WebContent.java
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=1158189&r1=1158188&r2=1158189&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 Tue Aug 16 10:35:05 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.ResultFormat ;
+import com.hp.hpl.jena.sparql.resultset.ResultsFormat ;
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 ;
- ResultFormat format = ResultFormat.guessSyntax(resultFile) ;
+ ResultsFormat format = ResultsFormat.guessSyntax(resultFile) ;
- if ( ResultFormat.isRDFGraphSyntax(format) )
+ if ( ResultsFormat.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=1158189&r1=1158188&r2=1158189&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 Tue Aug 16 10:35:05 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, ResultFormat.FMT_RS_XML, true) ;
+ test_RS_fmt(rs, ResultsFormat.FMT_RS_XML, true) ;
}
@Test public void test_RS_8()
{
ResultSet rs = ResultSetFactory.load("testing/ResultSet/output.srx") ;
- test_RS_fmt(rs, ResultFormat.FMT_RS_JSON, true) ;
+ test_RS_fmt(rs, ResultsFormat.FMT_RS_JSON, true) ;
}
@Test public void test_RS_9()
{
ResultSet rs = ResultSetFactory.load("testing/ResultSet/output.srx") ;
- test_RS_fmt(rs, ResultFormat.FMT_RDF_XML, false) ;
+ test_RS_fmt(rs, ResultsFormat.FMT_RDF_XML, false) ;
}
- private void test_RS_fmt(ResultSet rs, ResultFormat fmt, boolean ordered)
+ private void test_RS_fmt(ResultSet rs, ResultsFormat 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=1158189&r1=1158188&r2=1158189&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/arq/cmdline/ModResultsIn.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/arq/cmdline/ModResultsIn.java Tue Aug 16 10:35:05 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.ResultFormat ;
+import com.hp.hpl.jena.sparql.resultset.ResultsFormat ;
public class ModResultsIn implements ArgModuleGeneral
{
protected final ArgDecl resultsInputFmtDecl = new ArgDecl(ArgDecl.HasValue, "in") ;
protected final ArgDecl fileDecl = new ArgDecl(ArgDecl.HasValue, "file") ;
- private ResultFormat inputFormat = ResultFormat.FMT_TEXT ;
+ private ResultsFormat inputFormat = ResultsFormat.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 = ResultFormat.guessSyntax(resultsFilename) ;
+ inputFormat = ResultsFormat.guessSyntax(resultsFilename) ;
// Set format
if ( cmdline.contains(resultsInputFmtDecl) )
{
String rFmt = cmdline.getValue(resultsInputFmtDecl) ;
- inputFormat = ResultFormat.lookup(rFmt) ;
+ inputFormat = ResultsFormat.lookup(rFmt) ;
if ( inputFormat == null )
cmdline.cmdError("Unrecognized output format: "+rFmt) ;
}
@@ -115,7 +115,7 @@ public class ModResultsIn implements Arg
}
- public ResultFormat getInputFormat() { return inputFormat ; }
+ public ResultsFormat 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=1158189&r1=1158188&r2=1158189&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/arq/cmdline/ModResultsOut.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/arq/cmdline/ModResultsOut.java Tue Aug 16 10:35:05 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.ResultFormat ;
+import com.hp.hpl.jena.sparql.resultset.ResultsFormat ;
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 ResultFormat resultsFormat = ResultFormat.FMT_UNKNOWN ;
+ private ResultsFormat resultsFormat = ResultsFormat.FMT_UNKNOWN ;
public void processArgs(CmdArgModule cmdline) throws IllegalArgumentException
{
if ( cmdline.contains(resultsFmtDecl) )
{
String rFmt = cmdline.getValue(resultsFmtDecl) ;
- resultsFormat = ResultFormat.lookup(rFmt) ;
+ resultsFormat = ResultsFormat.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 ResultFormat getResultsFormat() { return resultsFormat ; }
+ public ResultsFormat 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=1158189&r1=1158188&r2=1158189&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/arq/query.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/arq/query.java Tue Aug 16 10:35:05 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.ResultFormat ;
+import com.hp.hpl.jena.sparql.resultset.ResultsFormat ;
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, ResultFormat.FMT_NONE) ;
+ queryExec(false, ResultsFormat.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, ResultFormat fmt)
+ protected void queryExec(boolean timed, ResultsFormat fmt)
{
try{
Query query = modQuery.getQuery() ;
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=1158189&r1=1158188&r2=1158189&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 Tue Aug 16 10:35:05 2011
@@ -42,18 +42,18 @@ public class ResultSetFactory
* @return ResultSet
*/
- public static ResultSet load(String filenameOrURI, ResultFormat format)
+ public static ResultSet load(String filenameOrURI, ResultsFormat format)
{
if ( format == null )
- format = ResultFormat.guessSyntax(filenameOrURI) ;
+ format = ResultsFormat.guessSyntax(filenameOrURI) ;
if ( format == null )
{
Log.warn(ResultSet.class, "Null format - defaulting to XML") ;
- format = ResultFormat.FMT_RS_XML ;
+ format = ResultsFormat.FMT_RS_XML ;
}
- if ( format.equals(ResultFormat.FMT_TEXT) )
+ if ( format.equals(ResultsFormat.FMT_TEXT) )
{
Log.fatal(ResultSet.class, "Can't read a text result set") ;
throw new ResultSetException("Can't read a text result set") ;
@@ -71,55 +71,55 @@ public class ResultSetFactory
* @return ResultSet
*/
- public static ResultSet load(InputStream input, ResultFormat format)
+ public static ResultSet load(InputStream input, ResultsFormat format)
{
if ( format == null )
{
Log.warn(ResultSet.class, "Null format - defaulting to XML") ;
- format = ResultFormat.FMT_RS_XML ;
+ format = ResultsFormat.FMT_RS_XML ;
}
- if ( format.equals(ResultFormat.FMT_RS_JSON) )
+ if ( format.equals(ResultsFormat.FMT_RS_JSON) )
return JSONInput.fromJSON(input) ;
- if ( format.equals(ResultFormat.FMT_RS_TSV) )
+ if ( format.equals(ResultsFormat.FMT_RS_TSV) )
return TSVInput.fromTSV(input) ;
- if ( format.equals(ResultFormat.FMT_RS_BIO) )
+ if ( format.equals(ResultsFormat.FMT_RS_BIO) )
return BIOInput.fromBIO(input) ;
- if ( format.equals(ResultFormat.FMT_RS_XML) )
+ if ( format.equals(ResultsFormat.FMT_RS_XML) )
return ResultSetFactory.fromXML(input) ;
- if ( format.equals(ResultFormat.FMT_TEXT) )
+ if ( format.equals(ResultsFormat.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(ResultFormat.FMT_RDF_XML) )
+ if ( format.equals(ResultsFormat.FMT_RDF_XML) )
{
Model m = ModelFactory.createDefaultModel() ;
m.read(input, null) ;
return ResultSetFactory.fromRDF(m) ;
}
- if ( format.equals(ResultFormat.FMT_RDF_TTL) )
+ if ( format.equals(ResultsFormat.FMT_RDF_TTL) )
{
Model m = ModelFactory.createDefaultModel() ;
m.read(input, null, "TURTLE") ;
return ResultSetFactory.fromRDF(m) ;
}
- if ( format.equals(ResultFormat.FMT_RDF_N3) )
+ if ( format.equals(ResultsFormat.FMT_RDF_N3) )
{
Model m = ModelFactory.createDefaultModel() ;
m.read(input, null, "N3") ;
return ResultSetFactory.fromRDF(m) ;
}
- if ( format.equals(ResultFormat.FMT_RDF_NT) )
+ if ( format.equals(ResultsFormat.FMT_RDF_NT) )
{
Model m = ModelFactory.createDefaultModel() ;
m.read(input, null, "N-TRIPLES") ;
@@ -157,7 +157,7 @@ public class ResultSetFactory
* @return Model
*/
- public static Model loadAsModel(String filenameOrURI, ResultFormat format)
+ public static Model loadAsModel(String filenameOrURI, ResultsFormat format)
{ return loadAsModel(null, filenameOrURI, format) ; }
/** Load a result set (or any other model) from file or URL.
@@ -169,27 +169,27 @@ public class ResultSetFactory
* @return Model
*/
- public static Model loadAsModel(Model model, String filenameOrURI, ResultFormat format)
+ public static Model loadAsModel(Model model, String filenameOrURI, ResultsFormat format)
{
if ( model == null )
model = GraphFactory.makeDefaultModel() ;
if ( format == null )
- format = ResultFormat.guessSyntax(filenameOrURI) ;
+ format = ResultsFormat.guessSyntax(filenameOrURI) ;
if ( format == null )
{
Log.warn(ResultSet.class, "Null format - defaulting to XML") ;
- format = ResultFormat.FMT_RS_XML ;
+ format = ResultsFormat.FMT_RS_XML ;
}
- if ( format.equals(ResultFormat.FMT_TEXT) )
+ if ( format.equals(ResultsFormat.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(ResultFormat.FMT_RS_XML) || format.equals(ResultFormat.FMT_RS_JSON))
+ if ( format.equals(ResultsFormat.FMT_RS_XML) || format.equals(ResultsFormat.FMT_RS_JSON))
{
InputStream in = null ;
try {
@@ -201,7 +201,7 @@ public class ResultSetFactory
SPARQLResult x = null ;
- if ( format.equals(ResultFormat.FMT_RS_JSON) )
+ if ( format.equals(ResultsFormat.FMT_RS_JSON) )
x = JSONInput.make(in, GraphFactory.makeDefaultModel()) ;
else
x = XMLInput.make(in, GraphFactory.makeDefaultModel()) ;
@@ -214,7 +214,7 @@ public class ResultSetFactory
return model ;
}
- if ( ResultFormat.isRDFGraphSyntax(format) )
+ if ( ResultsFormat.isRDFGraphSyntax(format) )
return FileManager.get().readModel(model, filenameOrURI) ;
Log.fatal(ResultSet.class, "Unknown result set syntax: "+format) ;
@@ -234,24 +234,24 @@ public class ResultSetFactory
* Read in any kind of result kind (result set, boolean, graph)
*/
- public static SPARQLResult result(String filenameOrURI, ResultFormat format)
+ public static SPARQLResult result(String filenameOrURI, ResultsFormat format)
{
if ( format == null )
- format = ResultFormat.guessSyntax(filenameOrURI) ;
+ format = ResultsFormat.guessSyntax(filenameOrURI) ;
if ( format == null )
{
Log.warn(ResultSet.class, "Null format - defaulting to XML") ;
- format = ResultFormat.FMT_RS_XML ;
+ format = ResultsFormat.FMT_RS_XML ;
}
- if ( format.equals(ResultFormat.FMT_TEXT) )
+ if ( format.equals(ResultsFormat.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(ResultFormat.FMT_RS_XML) || format.equals(ResultFormat.FMT_RS_JSON) || format.equals(ResultFormat.FMT_RS_TSV) )
+ if ( format.equals(ResultsFormat.FMT_RS_XML) || format.equals(ResultsFormat.FMT_RS_JSON) || format.equals(ResultsFormat.FMT_RS_TSV) )
{
InputStream in = null ;
try {
@@ -263,16 +263,16 @@ public class ResultSetFactory
SPARQLResult x = null ;
- if ( format.equals(ResultFormat.FMT_RS_JSON) )
+ if ( format.equals(ResultsFormat.FMT_RS_JSON) )
return JSONInput.make(in, GraphFactory.makeDefaultModel()) ;
- else if ( format.equals(ResultFormat.FMT_RS_XML) )
+ else if ( format.equals(ResultsFormat.FMT_RS_XML) )
return XMLInput.make(in, GraphFactory.makeDefaultModel()) ;
- else if ( format.equals(ResultFormat.FMT_RS_TSV) )
+ else if ( format.equals(ResultsFormat.FMT_RS_TSV) )
{
ResultSet rs = TSVInput.fromTSV(in) ;
return new SPARQLResult(rs) ;
}
- else if ( format.equals(ResultFormat.FMT_RS_BIO) )
+ else if ( format.equals(ResultsFormat.FMT_RS_BIO) )
{
ResultSet rs = BIOInput.fromBIO(in) ;
return new SPARQLResult(rs) ;
@@ -280,7 +280,7 @@ public class ResultSetFactory
}
}
- if ( ResultFormat.isRDFGraphSyntax(format) )
+ if ( ResultsFormat.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=1158189&r1=1158188&r2=1158189&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 Tue Aug 16 10:35:05 2011
@@ -29,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.ResultFormat ;
+import com.hp.hpl.jena.sparql.resultset.ResultsFormat ;
import com.hp.hpl.jena.sparql.resultset.TSVOutput ;
import com.hp.hpl.jena.sparql.resultset.TextOutput ;
import com.hp.hpl.jena.sparql.resultset.XMLOutput ;
@@ -279,7 +279,7 @@ public class ResultSetFormatter
* @param rFmt A format to encode the result set in
*/
- static public void output(ResultSet resultSet, ResultFormat rFmt)
+ static public void output(ResultSet resultSet, ResultsFormat rFmt)
{ output(System.out, resultSet, rFmt) ; }
/** Output a ResultSet in some format.
@@ -290,57 +290,57 @@ public class ResultSetFormatter
* @param rFmt A format to encode the result set in
*/
- static public void output(OutputStream outStream, ResultSet resultSet, ResultFormat rFmt)
+ static public void output(OutputStream outStream, ResultSet resultSet, ResultsFormat rFmt)
{
- if ( rFmt.equals(ResultFormat.FMT_RS_XML) )
+ if ( rFmt.equals(ResultsFormat.FMT_RS_XML) )
{
outputAsXML(outStream, resultSet) ;
return ;
}
- if ( rFmt.equals(ResultFormat.FMT_RS_JSON) )
+ if ( rFmt.equals(ResultsFormat.FMT_RS_JSON) )
{
outputAsJSON(outStream, resultSet) ;
return ;
}
- if ( rFmt.equals(ResultFormat.FMT_RS_CSV) )
+ if ( rFmt.equals(ResultsFormat.FMT_RS_CSV) )
{
outputAsCSV(outStream, resultSet);
return ;
}
- if ( rFmt.equals(ResultFormat.FMT_RS_TSV) )
+ if ( rFmt.equals(ResultsFormat.FMT_RS_TSV) )
{
outputAsTSV(outStream, resultSet);
return ;
}
- if ( rFmt.equals(ResultFormat.FMT_RS_BIO) )
+ if ( rFmt.equals(ResultsFormat.FMT_RS_BIO) )
{
outputAsBIO(outStream, resultSet);
return ;
}
- if ( rFmt.equals(ResultFormat.FMT_RS_JSON) )
+ if ( rFmt.equals(ResultsFormat.FMT_RS_JSON) )
{
outputAsJSON(outStream, resultSet) ;
return ;
}
- if ( rFmt.equals(ResultFormat.FMT_RDF_XML) )
+ if ( rFmt.equals(ResultsFormat.FMT_RDF_XML) )
{
outputAsRDF(outStream, "RDF/XML-ABBREV", resultSet) ;
return ;
}
- if ( rFmt.equals(ResultFormat.FMT_RDF_TTL) )
+ if ( rFmt.equals(ResultsFormat.FMT_RDF_TTL) )
{
outputAsRDF(outStream, "TTL", resultSet) ;
return ;
}
- if ( rFmt.equals(ResultFormat.FMT_RDF_NT) )
+ if ( rFmt.equals(ResultsFormat.FMT_RDF_NT) )
{
outputAsRDF(outStream, "N-TRIPLES", resultSet) ;
return ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorBase.java?rev=1158189&r1=1158188&r2=1158189&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorBase.java Tue Aug 16 10:35:05 2011
@@ -25,7 +25,8 @@ import com.hp.hpl.jena.sparql.util.Utils
* <ul>
* <li>autoclose when the iterator runs out</li>
* <li>ensuring query iterators only contain Bindings</li>
- * </ul> */
+ * </ul>
+ */
public abstract class QueryIteratorBase
extends PrintSerializableBase
@@ -38,12 +39,17 @@ public abstract class QueryIteratorBase
// .cancel() can be called asynchronously with iterator execution.
// It causes notification to cancellation to be made, once, by calling .requestCancel()
// which is called synchronously with .cancel() and asynchronously with iterator execution.
+
+ // ONLY the requestingCancel variable needs to be volatile. The abortIterator is guaranteed to
+ // be visible because it is written to before requestingCancel, and read from after.
/** In the process of requesting a cancel, or one has been done */
- private boolean requestingCancel = false;
+ private volatile boolean requestingCancel = false;
/* If set, any hasNext/next throws QueryAbortedException */
- private volatile boolean abortIterator = false ;
+ private boolean abortIterator = false ;
+ private Object cancelLock = new Object();
+
private Throwable stackTrace = null ;
public QueryIteratorBase()
@@ -79,8 +85,13 @@ public abstract class QueryIteratorBase
// Even if aborted. Finished is finished.
return false ;
- if ( abortIterator )
+ if ( requestingCancel && abortIterator )
+ {
+ // Try to close first to release resources (in case the user
+ // doesn't have a close() call in a finally block)
+ close() ;
throw new QueryCancelledException() ;
+ }
// Handles exceptions
boolean r = hasNextBinding() ;
@@ -94,7 +105,7 @@ public abstract class QueryIteratorBase
abort() ; // Abort this iterator.
throw ex ; // And pass on up the exception.
}
- return r ;
+ return r ;
}
/** final - autoclose and registration relies on it - implement moveToNextBinding() */
@@ -107,13 +118,18 @@ public abstract class QueryIteratorBase
public final Binding nextBinding()
{
try {
- if ( abortIterator )
+ // Need to make sure to only read this once per iteration
+ boolean shouldCancel = requestingCancel;
+
+ if ( shouldCancel && abortIterator )
+ {
+ // Try to close first to release resources (in case the user
+ // doesn't have a close() call in a finally block)
+ close() ;
throw new QueryCancelledException() ;
+ }
if ( finished )
{
- // If abortIterator set after finished.
- if ( abortIterator )
- throw new QueryCancelledException() ;
throw new NoSuchElementException(Utils.className(this)) ;
}
@@ -124,7 +140,7 @@ public abstract class QueryIteratorBase
if ( obj == null )
throw new NoSuchElementException(Utils.className(this)) ;
- if ( requestingCancel && ! finished )
+ if ( shouldCancel && ! finished )
{
// But .cancel sets both requestingCancel and abortIterator
// This only happens with a continuing iterator.
@@ -159,39 +175,46 @@ public abstract class QueryIteratorBase
@Deprecated
public void abort()
{
+ // Calling cancel() is the preferred style.
if ( finished )
return ;
try { closeIterator() ; }
catch (QueryException ex) { }
-
finished = true ;
}
/** Cancel this iterator */
- public final void cancel() {
+ public final void cancel()
+ {
// Call requestCancel() once.
- if (!this.requestingCancel) {
- synchronized (this)
- {
- this.requestCancel() ;
- this.requestingCancel = true;
- this.abortIterator = true ;
+ synchronized (cancelLock)
+ {
+ if (!this.requestingCancel)
+ {
+ // Need to set the flags before allowing subclasses to handle requestCancel() in order
+ // to prevent a race condition. We want to be sure that calls to hasNext()/nextBinding()
+ // will definitely throw a QueryCancelledException in this class and not allow a
+ // situation in which a subclass component thinks it is canceled, while this class does not.
+ this.abortIterator = true ;
+ this.requestingCancel = true;
+ this.requestCancel() ;
}
- }
+ }
}
/** Cancel this iterator but allow it to continue servicing hasNext/next.
- * Wrong answers are possible(e.g. partial ORDER BY and LIMIT).
- * May be useful for debugging.
+ * Wrong answers are possible (e.g. partial ORDER BY and LIMIT).
*/
- public final void cancelAllowContinue() {
+ public final void cancelAllowContinue()
+ {
// Call requestCancel() once.
- if (!this.requestingCancel) {
- synchronized (this)
+ synchronized (cancelLock)
+ {
+ if (!this.requestingCancel)
{
- this.requestCancel() ;
- this.requestingCancel = true;
//this.abortIterator = true ;
+ this.requestingCancel = true;
+ this.requestCancel() ;
}
}
}
Copied: incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/resultset/ResultsFormat.java (from r1157915, incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/resultset/ResultFormat.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/resultset/ResultsFormat.java?p2=incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/resultset/ResultsFormat.java&p1=incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/resultset/ResultFormat.java&r1=1157915&r2=1158189&rev=1158189&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/resultset/ResultFormat.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/resultset/ResultsFormat.java Tue Aug 16 10:35:05 2011
@@ -7,25 +7,54 @@
package com.hp.hpl.jena.sparql.resultset;
+import static org.openjena.riot.WebContent.* ;
+
+import com.hp.hpl.jena.sparql.util.Symbol ;
import com.hp.hpl.jena.sparql.util.TranslationTable ;
-public enum ResultFormat
+// Better ....
+//public enum ResultFormat
+//{
+// // 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 ;
+
+public class ResultsFormat extends Symbol
{
- // 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 ;
+ // ---- Compatibility (this started pre java 1.5)
+ private ResultsFormat(String symbol)
+ {
+ super(symbol) ;
+ }
+
+ static public ResultsFormat FMT_RS_XML = new ResultsFormat(contentTypeResultsXML) ;
+ static public ResultsFormat FMT_RS_JSON = new ResultsFormat(contentTypeResultsJSON) ;
+ static public ResultsFormat FMT_RS_CSV = new ResultsFormat(contentTypeTextCSV) ;
+ static public ResultsFormat FMT_RS_TSV = new ResultsFormat(contentTypeTextTSV) ;
+ static public ResultsFormat FMT_RS_SSE = new ResultsFormat(contentTypeSSE) ;
+ static public ResultsFormat FMT_RS_BIO = new ResultsFormat(contentTypeResultsBIO) ;
+ static public ResultsFormat FMT_NONE = new ResultsFormat("none") ;
+ static public ResultsFormat FMT_TEXT = new ResultsFormat("text") ;
+ static public ResultsFormat FMT_TUPLES = new ResultsFormat("tuples") ;
+ static public ResultsFormat FMT_COUNT = new ResultsFormat("count") ;
+ static public ResultsFormat FMT_RS_RDF = new ResultsFormat(contentTypeRDFXML) ;
+ static public ResultsFormat FMT_RDF_XML = new ResultsFormat(contentTypeRDFXML) ;
+ static public ResultsFormat FMT_RDF_N3 = new ResultsFormat(contentTypeN3) ;
+ 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_UNKNOWN = new ResultsFormat("unknown") ;
+ // ---- Compatibility
// Common names to symbol (used by arq.rset)
- private static TranslationTable<ResultFormat> names = new TranslationTable<ResultFormat>(true) ;
+ private static TranslationTable<ResultsFormat> names = new TranslationTable<ResultsFormat>(true) ;
static {
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) ;
@@ -34,7 +63,6 @@ public enum ResultFormat
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) ;
@@ -48,12 +76,12 @@ public enum ResultFormat
}
- public static ResultFormat guessSyntax(String url)
+ public static ResultsFormat guessSyntax(String url)
{
return guessSyntax(url, FMT_RS_XML) ;
}
- public static boolean isRDFGraphSyntax(ResultFormat fmt)
+ public static boolean isRDFGraphSyntax(ResultsFormat fmt)
{
if ( FMT_RDF_N3.equals(fmt) ) return true ;
if ( FMT_RDF_TURTLE.equals(fmt) ) return true ;
@@ -62,7 +90,7 @@ public enum ResultFormat
return false ;
}
- public static ResultFormat guessSyntax(String url, ResultFormat defaultFormat)
+ public static ResultsFormat guessSyntax(String url, ResultsFormat defaultFormat)
{
// -- XML
if ( url.endsWith(".srx") )
@@ -109,7 +137,7 @@ public enum ResultFormat
* @return ResultSetFormat
*/
- public static ResultFormat lookup(String s)
+ public static ResultsFormat lookup(String s)
{
return names.lookup(s) ;
}
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=1158189&r1=1158188&r2=1158189&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 Tue Aug 16 10:35:05 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.ResultFormat ;
+import com.hp.hpl.jena.sparql.resultset.ResultsFormat ;
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, ResultFormat.FMT_TEXT) ;
+ QueryExecUtils.executeAlgebra(op, dsg, ResultsFormat.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=1158189&r1=1158188&r2=1158189&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 Tue Aug 16 10:35:05 2011
@@ -36,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.ResultFormat ;
+import com.hp.hpl.jena.sparql.resultset.ResultsFormat ;
import com.hp.hpl.jena.sparql.vocabulary.ResultSetGraphVocab ;
/** Some utilities for query processing. */
@@ -54,10 +54,10 @@ public class QueryExecUtils
public static void executeQuery(Query query, QueryExecution queryExecution)
{
- executeQuery(query, queryExecution, ResultFormat.FMT_TEXT) ;
+ executeQuery(query, queryExecution, ResultsFormat.FMT_TEXT) ;
}
- public static void executeQuery(Query query, QueryExecution queryExecution, ResultFormat outputFormat)
+ public static void executeQuery(Query query, QueryExecution queryExecution, ResultsFormat outputFormat)
{
if ( query.isSelectType() )
doSelectQuery(query, queryExecution, outputFormat) ;
@@ -70,7 +70,7 @@ public class QueryExecUtils
queryExecution.close() ;
}
- public static void executeAlgebra(Op op, DatasetGraph dsg, ResultFormat outputFormat)
+ public static void executeAlgebra(Op op, DatasetGraph dsg, ResultsFormat outputFormat)
{
QueryIterator qIter = Algebra.exec(op, dsg) ;
@@ -85,29 +85,29 @@ public class QueryExecUtils
outputResultSet(results, null, outputFormat) ;
}
- public static void outputResultSet(ResultSet results, Prologue prologue, ResultFormat outputFormat)
+ public static void outputResultSet(ResultSet results, Prologue prologue, ResultsFormat outputFormat)
{
boolean done = false ;
if ( prologue == null )
prologue = new Prologue(globalPrefixMap) ;
- if ( outputFormat.equals(ResultFormat.FMT_UNKNOWN) )
- outputFormat = ResultFormat.FMT_TEXT ;
+ if ( outputFormat.equals(ResultsFormat.FMT_UNKNOWN) )
+ outputFormat = ResultsFormat.FMT_TEXT ;
- if ( outputFormat.equals(ResultFormat.FMT_NONE) ||
- outputFormat.equals(ResultFormat.FMT_COUNT) )
+ if ( outputFormat.equals(ResultsFormat.FMT_NONE) ||
+ outputFormat.equals(ResultsFormat.FMT_COUNT) )
{
int count = ResultSetFormatter.consume(results) ;
- if ( outputFormat.equals(ResultFormat.FMT_COUNT) )
+ if ( outputFormat.equals(ResultsFormat.FMT_COUNT) )
{
System.out.println("Count = "+count) ;
}
done = true ;
}
- if ( outputFormat.equals(ResultFormat.FMT_RS_RDF) ||
- outputFormat.equals(ResultFormat.FMT_RDF_N3) ||
- outputFormat.equals(ResultFormat.FMT_RDF_TTL) )
+ if ( outputFormat.equals(ResultsFormat.FMT_RS_RDF) ||
+ outputFormat.equals(ResultsFormat.FMT_RDF_N3) ||
+ outputFormat.equals(ResultsFormat.FMT_RDF_TTL) )
{
Model m = ResultSetFormatter.toModel(results) ;
m.setNsPrefixes(prologue.getPrefixMapping()) ;
@@ -117,31 +117,31 @@ public class QueryExecUtils
done = true ;
}
- if ( outputFormat.equals(ResultFormat.FMT_RS_XML) )
+ if ( outputFormat.equals(ResultsFormat.FMT_RS_XML) )
{
ResultSetFormatter.outputAsXML(System.out, results) ;
done = true ;
}
- if ( outputFormat.equals(ResultFormat.FMT_RS_JSON) )
+ if ( outputFormat.equals(ResultsFormat.FMT_RS_JSON) )
{
ResultSetFormatter.outputAsJSON(System.out, results) ;
done = true ;
}
- if ( outputFormat.equals(ResultFormat.FMT_RS_SSE) )
+ if ( outputFormat.equals(ResultsFormat.FMT_RS_SSE) )
{
ResultSetFormatter.outputAsSSE(System.out, results, prologue) ;
done = true ;
}
- if ( outputFormat.equals(ResultFormat.FMT_TEXT) )
+ if ( outputFormat.equals(ResultsFormat.FMT_TEXT) )
{
ResultSetFormatter.out(System.out, results, prologue) ;
done = true ;
}
- if ( outputFormat.equals(ResultFormat.FMT_TUPLES) )
+ if ( outputFormat.equals(ResultsFormat.FMT_TUPLES) )
{
PlainFormat pFmt = new PlainFormat(System.out, prologue) ;
ResultSetApply a = new ResultSetApply(results, pFmt) ;
@@ -149,19 +149,19 @@ public class QueryExecUtils
done = true ;
}
- if ( outputFormat.equals(ResultFormat.FMT_RS_CSV ) )
+ if ( outputFormat.equals(ResultsFormat.FMT_RS_CSV ) )
{
ResultSetFormatter.outputAsCSV(System.out, results) ;
done = true ;
}
- if ( outputFormat.equals(ResultFormat.FMT_RS_TSV ) )
+ if ( outputFormat.equals(ResultsFormat.FMT_RS_TSV ) )
{
ResultSetFormatter.outputAsTSV(System.out, results) ;
done = true ;
}
- if ( outputFormat.equals(ResultFormat.FMT_RS_BIO ) )
+ if ( outputFormat.equals(ResultsFormat.FMT_RS_BIO ) )
{
ResultSetFormatter.outputAsBIO(System.out, results) ;
done = true ;
@@ -174,43 +174,43 @@ public class QueryExecUtils
System.out.flush() ;
}
- private static void doSelectQuery(Query query, QueryExecution qe, ResultFormat outputFormat)
+ private static void doSelectQuery(Query query, QueryExecution qe, ResultsFormat outputFormat)
{
- if ( outputFormat == null || outputFormat == ResultFormat.FMT_UNKNOWN )
- outputFormat = ResultFormat.FMT_TEXT ;
+ if ( outputFormat == null || outputFormat == ResultsFormat.FMT_UNKNOWN )
+ outputFormat = ResultsFormat.FMT_TEXT ;
ResultSet results = qe.execSelect() ;
outputResultSet(results, query, outputFormat) ;
}
- private static void doDescribeQuery(Query query, QueryExecution qe, ResultFormat outputFormat)
+ private static void doDescribeQuery(Query query, QueryExecution qe, ResultsFormat outputFormat)
{
- if ( outputFormat == null || outputFormat == ResultFormat.FMT_UNKNOWN )
- outputFormat = ResultFormat.FMT_RDF_TTL ;
+ if ( outputFormat == null || outputFormat == ResultsFormat.FMT_UNKNOWN )
+ outputFormat = ResultsFormat.FMT_RDF_TTL ;
Model r = qe.execDescribe() ;
writeModel(query, r, outputFormat) ;
}
- private static void doConstructQuery(Query query, QueryExecution qe, ResultFormat outputFormat)
+ private static void doConstructQuery(Query query, QueryExecution qe, ResultsFormat outputFormat)
{
- if ( outputFormat == null || outputFormat == ResultFormat.FMT_UNKNOWN )
- outputFormat = ResultFormat.FMT_RDF_TTL ;
+ if ( outputFormat == null || outputFormat == ResultsFormat.FMT_UNKNOWN )
+ outputFormat = ResultsFormat.FMT_RDF_TTL ;
Model r = qe.execConstruct() ;
writeModel(query, r, outputFormat) ;
}
- private static void writeModel(Query query, Model model, ResultFormat outputFormat)
+ private static void writeModel(Query query, Model model, ResultsFormat outputFormat)
{
- if ( outputFormat == null || outputFormat == ResultFormat.FMT_UNKNOWN )
- outputFormat = ResultFormat.FMT_TEXT ;
+ if ( outputFormat == null || outputFormat == ResultsFormat.FMT_UNKNOWN )
+ outputFormat = ResultsFormat.FMT_TEXT ;
- if ( outputFormat.equals(ResultFormat.FMT_NONE) )
+ if ( outputFormat.equals(ResultsFormat.FMT_NONE) )
return ;
- if ( outputFormat.equals(ResultFormat.FMT_TEXT))
+ if ( outputFormat.equals(ResultsFormat.FMT_TEXT))
{
String qType = "" ;
if ( query.isDescribeType() ) qType = "DESCRIBE" ;
@@ -222,25 +222,25 @@ public class QueryExecUtils
return ;
}
- if ( outputFormat.equals(ResultFormat.FMT_RDF_XML) )
+ if ( outputFormat.equals(ResultsFormat.FMT_RDF_XML) )
{
model.write(System.out, "RDF/XML-ABBREV", null) ;
return ;
}
- if ( outputFormat.equals(ResultFormat.FMT_RDF_TTL) )
+ if ( outputFormat.equals(ResultsFormat.FMT_RDF_TTL) )
{
model.write(System.out, "N3", null) ;
return ;
}
- if ( outputFormat.equals(ResultFormat.FMT_RDF_N3) )
+ if ( outputFormat.equals(ResultsFormat.FMT_RDF_N3) )
{
model.write(System.out, "N3", null) ;
return ;
}
- if ( outputFormat.equals(ResultFormat.FMT_RDF_NT) )
+ if ( outputFormat.equals(ResultsFormat.FMT_RDF_NT) )
{
model.write(System.out, "N_TRIPLES", null) ;
return ;
@@ -249,41 +249,41 @@ public class QueryExecUtils
System.err.println("Unknown format: "+outputFormat) ;
}
- private static void doAskQuery(Query query, QueryExecution qe, ResultFormat outputFormat)
+ private static void doAskQuery(Query query, QueryExecution qe, ResultsFormat outputFormat)
{
boolean b = qe.execAsk() ;
- if ( outputFormat == null || outputFormat == ResultFormat.FMT_UNKNOWN )
- outputFormat = ResultFormat.FMT_TEXT ;
+ if ( outputFormat == null || outputFormat == ResultsFormat.FMT_UNKNOWN )
+ outputFormat = ResultsFormat.FMT_TEXT ;
- if ( outputFormat.equals(ResultFormat.FMT_RS_XML) )
+ if ( outputFormat.equals(ResultsFormat.FMT_RS_XML) )
{
ResultSetFormatter.outputAsXML(System.out, b) ;
return ;
}
- if ( outputFormat.equals(ResultFormat.FMT_RDF_N3) ||
- outputFormat.equals(ResultFormat.FMT_RDF_TTL) )
+ if ( outputFormat.equals(ResultsFormat.FMT_RDF_N3) ||
+ outputFormat.equals(ResultsFormat.FMT_RDF_TTL) )
{
ResultSetFormatter.outputAsRDF(System.out, "TURTLE", b) ;
System.out.flush() ;
return ;
}
- if ( outputFormat.equals(ResultFormat.FMT_RS_JSON) )
+ if ( outputFormat.equals(ResultsFormat.FMT_RS_JSON) )
{
ResultSetFormatter.outputAsJSON(System.out, b) ;
return ;
}
- if ( outputFormat.equals(ResultFormat.FMT_TEXT) )
+ if ( outputFormat.equals(ResultsFormat.FMT_TEXT) )
{
//ResultSetFormatter.out(System.out, b) ;
System.out.println("Ask => "+(b?"Yes":"No")) ;
return ;
}
- if ( outputFormat.equals(ResultFormat.FMT_RS_CSV) )
+ if ( outputFormat.equals(ResultsFormat.FMT_RS_CSV) )
{
ResultSetFormatter.outputAsCSV(System.out, b) ;
return ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/WebContent.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/WebContent.java?rev=1158189&r1=1158188&r2=1158189&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/WebContent.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/WebContent.java Tue Aug 16 10:35:05 2011
@@ -59,6 +59,8 @@ public class WebContent
public static final String contentTypeTextCSV = "text/csv" ;
public static final String contentTypeTextTSV = "text/tab-separated-values" ;
+ public static final String contentTypeSSE = "text/sse" ;
+
public static final String charsetUTF8 = "utf-8" ;
public static final String charsetASCII = "ascii" ;