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 2012/08/22 22:02:05 UTC
svn commit: r1376216 - in /jena/trunk/jena-fuseki: ReleaseNotes.txt run_cp src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java

Author: andy
Date: Wed Aug 22 20:02:05 2012
New Revision: 1376216

URL: http://svn.apache.org/viewvc?rev=1376216&view=rev
Log:
Support ?default-graph-uri= and ?named-graph-uri= when querying local datasets (picks out local graphs).

Modified:
    jena/trunk/jena-fuseki/ReleaseNotes.txt
    jena/trunk/jena-fuseki/run_cp
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java

Modified: jena/trunk/jena-fuseki/ReleaseNotes.txt
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/ReleaseNotes.txt?rev=1376216&r1=1376215&r2=1376216&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/ReleaseNotes.txt (original)
+++ jena/trunk/jena-fuseki/ReleaseNotes.txt Wed Aug 22 20:02:05 2012
@@ -3,6 +3,8 @@
 == Fuseki 0.2.4
 
 + JENA-295 - Implement using-graph-uri= and using-named-graph-uri=
++ Add support for default-graph-uri= and named-graph-uri= query parameters to a dataset.
+  It picks the specific graphs out of the dataset for the query. 
 
 == Fuseki 0.2.3
 

Modified: jena/trunk/jena-fuseki/run_cp
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/run_cp?rev=1376216&r1=1376215&r2=1376216&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/run_cp (original)
+++ jena/trunk/jena-fuseki/run_cp Wed Aug 22 20:02:05 2012
@@ -1,6 +1,6 @@
 #!/bin/bash
 M2_REPO="${M2_REPO:-$HOME/.m2/repository}"
 
-CP="/home/afs/.m2/repo/org/apache/jena/jena-arq/2.9.3-SNAPSHOT/jena-arq-2.9.3-SNAPSHOT.jar:/home/afs/.m2/repo/commons-codec/commons-codec/1.5/commons-codec-1.5.jar:/home/afs/.m2/repo/org/apache/httpcomponents/httpcore/4.1.3/httpcore-4.1.3.jar:/home/afs/.m2/repo/org/apache/jena/jena-core/2.7.3-SNAPSHOT/jena-core-2.7.3-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/jena/jena-iri/0.9.3-SNAPSHOT/jena-iri-0.9.3-SNAPSHOT.jar:/home/afs/.m2/repo/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar:/home/afs/.m2/repo/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar:/home/afs/.m2/repo/org/apache/jena/jena-tdb/0.9.3-SNAPSHOT/jena-tdb-0.9.3-SNAPSHOT.jar:/home/afs/.m2/repo/junit/junit/4.9/junit-4.9.jar:/home/afs/.m2/repo/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar:/home/afs/.m2/repo/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2.jar:/home/afs/.m2/repo/commons-fileupload/commons-fileupload/1.2.2/commons-fileupload-1.2.2.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-server/7.5.4.v
 20111024/jetty-server-7.5.4.v20111024.jar:/home/afs/.m2/repo/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-continuation/7.5.4.v20111024/jetty-continuation-7.5.4.v20111024.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-http/7.5.4.v20111024/jetty-http-7.5.4.v20111024.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-io/7.5.4.v20111024/jetty-io-7.5.4.v20111024.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-servlet/7.5.4.v20111024/jetty-servlet-7.5.4.v20111024.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-security/7.5.4.v20111024/jetty-security-7.5.4.v20111024.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-servlets/7.5.4.v20111024/jetty-servlets-7.5.4.v20111024.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-client/7.5.4.v20111024/jetty-client-7.5.4.v20111024.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-util/7.5.4.v20111024/jetty-util-7.5.4.v20111024.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-xml/7.5.4.v20111024/jetty-xml-7.5.4.v
 20111024.jar:/home/afs/.m2/repo/org/apache/velocity/velocity/1.7/velocity-1.7.jar:/home/afs/.m2/repo/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar:/home/afs/.m2/repo/commons-lang/commons-lang/2.4/commons-lang-2.4.jar:/home/afs/.m2/repo/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar:/home/afs/.m2/repo/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar:/home/afs/.m2/repo/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4.jar:/home/afs/.m2/repo/log4j/log4j/1.2.16/log4j-1.2.16.jar"
+CP="/home/afs/.m2/repo/org/apache/jena/jena-arq/2.9.4-SNAPSHOT/jena-arq-2.9.4-SNAPSHOT.jar:/home/afs/.m2/repo/commons-codec/commons-codec/1.5/commons-codec-1.5.jar:/home/afs/.m2/repo/org/apache/httpcomponents/httpcore/4.1.3/httpcore-4.1.3.jar:/home/afs/.m2/repo/org/apache/jena/jena-core/2.7.4-SNAPSHOT/jena-core-2.7.4-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/jena/jena-iri/0.9.4-SNAPSHOT/jena-iri-0.9.4-SNAPSHOT.jar:/home/afs/.m2/repo/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar:/home/afs/.m2/repo/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar:/home/afs/.m2/repo/org/apache/jena/jena-tdb/0.9.4-SNAPSHOT/jena-tdb-0.9.4-SNAPSHOT.jar:/home/afs/.m2/repo/junit/junit/4.9/junit-4.9.jar:/home/afs/.m2/repo/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar:/home/afs/.m2/repo/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2.jar:/home/afs/.m2/repo/commons-fileupload/commons-fileupload/1.2.2/commons-fileupload-1.2.2.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-server/7.5.4.v
 20111024/jetty-server-7.5.4.v20111024.jar:/home/afs/.m2/repo/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-continuation/7.5.4.v20111024/jetty-continuation-7.5.4.v20111024.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-http/7.5.4.v20111024/jetty-http-7.5.4.v20111024.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-io/7.5.4.v20111024/jetty-io-7.5.4.v20111024.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-servlet/7.5.4.v20111024/jetty-servlet-7.5.4.v20111024.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-security/7.5.4.v20111024/jetty-security-7.5.4.v20111024.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-servlets/7.5.4.v20111024/jetty-servlets-7.5.4.v20111024.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-client/7.5.4.v20111024/jetty-client-7.5.4.v20111024.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-util/7.5.4.v20111024/jetty-util-7.5.4.v20111024.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-xml/7.5.4.v20111024/jetty-xml-7.5.4.v
 20111024.jar:/home/afs/.m2/repo/org/apache/velocity/velocity/1.7/velocity-1.7.jar:/home/afs/.m2/repo/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar:/home/afs/.m2/repo/commons-lang/commons-lang/2.4/commons-lang-2.4.jar:/home/afs/.m2/repo/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar:/home/afs/.m2/repo/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar:/home/afs/.m2/repo/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4.jar:/home/afs/.m2/repo/log4j/log4j/1.2.16/log4j-1.2.16.jar"
 
 echo "$CP"

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java?rev=1376216&r1=1376215&r2=1376216&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java Wed Aug 22 20:02:05 2012
@@ -26,6 +26,8 @@ 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.sparql.core.DatasetDescription ;
+import com.hp.hpl.jena.sparql.core.DatasetGraph ;
+import com.hp.hpl.jena.sparql.core.DynamicDatasets ;
 
 public class SPARQL_QueryDataset extends SPARQL_Query
 {
@@ -60,11 +62,18 @@ public class SPARQL_QueryDataset extends
     @Override
     protected Dataset decideDataset(HttpActionQuery action, Query query, String queryStringLog) 
     { 
+        DatasetGraph dsg = action.getActiveDSG() ;
+        
+        // query.getDatasetDescription() ;
+        
         // Protocol.
         DatasetDescription dsDesc = getDatasetDescription(action) ;
         if (dsDesc != null )
-            errorBadRequest("SPARQL Query: Dataset description in the protocol request") ;  
+        {
+            //errorBadRequest("SPARQL Query: Dataset description in the protocol request") ;
+            dsg = DynamicDatasets.dynamicDataset(dsDesc, dsg, false) ;
+        }
         
-        return DatasetFactory.create(action.getActiveDSG()) ;
+        return DatasetFactory.create(dsg) ;
     }
 }