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 2013/05/27 18:25:14 UTC
svn commit: r1486653 - in /jena/trunk/jena-arq/src/main/java:
com/hp/hpl/jena/sparql/engine/http/ com/hp/hpl/jena/sparql/engine/main/
com/hp/hpl/jena/sparql/sse/ com/hp/hpl/jena/sparql/sse/builders/
org/apache/jena/riot/tokens/
Author: andy
Date: Mon May 27 16:25:13 2013
New Revision: 1486653
URL: http://svn.apache.org/r1486653
Log:
Misc maintainence:
Adding getting strings from RIOT parser Tokens.
Add convenience operations for datasetgraphs to SSE
Tidy white space
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/QueryEngineMain.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/SSE.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderGraph.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java?rev=1486653&r1=1486652&r2=1486653&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java Mon May 27 16:25:13 2013
@@ -648,7 +648,7 @@ public class QueryEngineHTTP implements
if (lang == null)
throw new IllegalArgumentException("Given Content Type '" + contentType + "' is not supported by RIOT") ;
if (!RDFLanguages.isTriples(lang))
- throw new IllegalArgumentException("Given Content Type '" + contentType + " is not a RDF Graph format") ;
+ throw new IllegalArgumentException("Given Content Type '" + contentType + "' is not a RDF Graph format") ;
modelContentType = contentType ;
}
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/QueryEngineMain.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/QueryEngineMain.java?rev=1486653&r1=1486652&r2=1486653&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/QueryEngineMain.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/QueryEngineMain.java Mon May 27 16:25:13 2013
@@ -71,12 +71,6 @@ public class QueryEngineMain extends Que
return qIter ;
}
-// protected Op createOp(Query query, AlgebraGenerator gen)
-// {
-// Op op = super.createOp(query, gen) ;
-// return op ;
-// }
-
@Override
protected Op modifyOp(Op op)
{
@@ -87,17 +81,11 @@ public class QueryEngineMain extends Que
protected Op minimalModifyOp(Op op)
{
- // Must always do this for QueryEngineMain
+ // Must always do this for QueryEngineMain.
// The optimizer does do this.
return TransformScopeRename.transform(op) ;
}
-// @Override
-// public void close()
-// {
-// super.close() ;
-// }
-
// -------- Factory
private static QueryEngineFactory factory = new QueryEngineFactory()
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/SSE.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/SSE.java?rev=1486653&r1=1486652&r2=1486653&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/SSE.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/SSE.java Mon May 27 16:25:13 2013
@@ -153,7 +153,6 @@ public class SSE
return BuilderGraph.buildGraph(item) ;
}
-
/** Read in a file, parse, and obtain a graph */
public static Graph readGraph(String filename) { return readGraph(filename, null) ; }
@@ -174,6 +173,37 @@ public class SSE
BuilderGraph.buildGraph(graph, item) ;
}
+ /** Parse a string, and obtain a DatasetGraph */
+ public static DatasetGraph parseDatasetGraph(String string) { return parseDatasetGraph(string, null) ; }
+
+ /** Parse a string, and obtain a graph */
+ public static DatasetGraph parseDatasetGraph(String string, PrefixMapping pmap)
+ {
+ Item item = parse(string, pmap) ;
+ return BuilderGraph.buildDataset(item) ;
+ }
+
+ /** Read in a file, parse, and obtain a graph */
+ public static DatasetGraph readDatasetGraph(String filename) { return readDatasetGraph(filename, null) ; }
+
+ /** Read in a file, parse, and obtain a DatasetGraph */
+ public static DatasetGraph readDatasetGraph(String filename, PrefixMapping pmap)
+ {
+ Item item = readFile(filename, pmap) ;
+ return BuilderGraph.buildDataset(item) ;
+ }
+
+ /** Read in a file, parse, and obtain a DatasetGraph */
+ public static void readDatasetGraph(DatasetGraph dsg, String filename) { readDatasetGraph(dsg, filename, null) ; }
+
+ /** Read in a file, parse, and obtain a DatasetGraph */
+ public static void readDatasetGraph(DatasetGraph dsg, String filename, PrefixMapping pmap)
+ {
+ Item item = readFile(filename, pmap) ;
+ BuilderGraph.buildDataset(dsg, item) ;
+ }
+
+
/** Read in a file, parse, and obtain a SPARQL algebra op */
public static Op readOp(String filename) { return Algebra.read(filename) ; }
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderGraph.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderGraph.java?rev=1486653&r1=1486652&r2=1486653&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderGraph.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderGraph.java Mon May 27 16:25:13 2013
@@ -101,6 +101,16 @@ public class BuilderGraph
public static DatasetGraph buildDataset(Item item)
{
+ return buildDataset(DatasetGraphFactory.createMem(), item) ;
+ }
+
+ public static DatasetGraph buildDataset(ItemList list)
+ {
+ return buildDataset(DatasetGraphFactory.createMem(), list) ;
+ }
+
+ public static DatasetGraph buildDataset(DatasetGraph dsg, Item item)
+ {
if (item.isNode() )
BuilderLib.broken(item, "Attempt to build dataset from a plain node") ;
@@ -115,14 +125,13 @@ public class BuilderGraph
if ( ! item.isTagged(Tags.tagDataset) )
BuilderLib.broken(item, "Wanted ("+Tags.tagDataset+"...)" );
- return buildDataset(item.getList()) ;
+ return buildDataset(dsg, item.getList()) ;
}
- public static DatasetGraph buildDataset(ItemList list)
+ public static DatasetGraph buildDataset(DatasetGraph dsg, ItemList list)
{
BuilderLib.checkTag(list, Tags.tagDataset) ;
list = list.cdr();
- DatasetGraph ds = DatasetGraphFactory.createMem() ;
for (Item item : list)
{
@@ -141,25 +150,25 @@ public class BuilderGraph
Graph g ;
if ( name == null )
{
- g = ds.getDefaultGraph() ;
+ g = dsg.getDefaultGraph() ;
if ( g == null )
{
g = GraphFactory.createDefaultGraph() ;
- ds.setDefaultGraph(g) ;
+ dsg.setDefaultGraph(g) ;
}
}
else
{
- g = ds.getGraph(name) ;
+ g = dsg.getGraph(name) ;
if ( g == null )
{
g = GraphFactory.createDefaultGraph() ;
- ds.addGraph(name, g) ;
+ dsg.addGraph(name, g) ;
}
}
BuilderGraph.buildGraph(g, graphContent) ;
}
- return ds ;
+ return dsg ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java?rev=1486653&r1=1486652&r2=1486653&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java Mon May 27 16:25:13 2013
@@ -189,6 +189,20 @@ public final class Token
this.column = token.column ;
}
+ // Convenience operations for accessing tokens.
+
+ public String asString() {
+ switch (tokenType)
+ {
+ case STRING:
+ case STRING1: case STRING2:
+ case LONG_STRING1: case LONG_STRING2:
+ return getImage() ;
+ default:
+ return null ;
+ }
+ }
+
public int asInt() {
if ( ! hasType(TokenType.INTEGER) ) return -1 ;
return Integer.valueOf(tokenImage);
@@ -205,7 +219,7 @@ public final class Token
{
case INTEGER: return Long.valueOf(tokenImage) ;
case HEX: return Long.valueOf(tokenImage, 16) ;
- default:
+ default:
return dft ;
}
}