jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1235954 - in /incubator/jena/Jena2/ARQ/trunk/src: main/java/com/hp/hpl/jena/sparql/engine/main/iterator/ main/java/com/hp/hpl/jena/sparql/lang/ test/java/arq/ test/java/com/hp/hpl/jena/sparql/junit/
Date Wed, 25 Jan 2012 21:16:38 GMT
Author: andy
Date: Wed Jan 25 21:16:37 2012
New Revision: 1235954

URL: http://svn.apache.org/viewvc?rev=1235954&view=rev
Log:
Fix SERVICE SILENT when an error occurs.
Allow non-strict (but sane) evaluation of SERVICE ?var.

Modified:
    incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/iterator/QueryIterService.java
    incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/SyntaxVarScope.java
    incubator/jena/Jena2/ARQ/trunk/src/test/java/arq/qtest.java
    incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/junit/EarlReport.java

Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/iterator/QueryIterService.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/iterator/QueryIterService.java?rev=1235954&r1=1235953&r2=1235954&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/iterator/QueryIterService.java
(original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/iterator/QueryIterService.java
Wed Jan 25 21:16:37 2012
@@ -25,11 +25,9 @@ import com.hp.hpl.jena.sparql.algebra.op
 import com.hp.hpl.jena.sparql.engine.ExecutionContext ;
 import com.hp.hpl.jena.sparql.engine.QueryIterator ;
 import com.hp.hpl.jena.sparql.engine.binding.Binding ;
+import com.hp.hpl.jena.sparql.engine.binding.BindingFactory ;
 import com.hp.hpl.jena.sparql.engine.http.Service ;
-import com.hp.hpl.jena.sparql.engine.iterator.QueryIter ;
-import com.hp.hpl.jena.sparql.engine.iterator.QueryIterCommonParent ;
-import com.hp.hpl.jena.sparql.engine.iterator.QueryIterNullIterator ;
-import com.hp.hpl.jena.sparql.engine.iterator.QueryIterRepeatApply ;
+import com.hp.hpl.jena.sparql.engine.iterator.* ;
 import com.hp.hpl.jena.sparql.engine.main.QC ;
 
 
@@ -56,7 +54,7 @@ public class QueryIterService extends Qu
             if ( silent )
             {
                 Log.warn(this, "SERVICE: "+ex.getMessage()) ;
-                return new QueryIterNullIterator(getExecContext()) ; 
+                return QueryIterSingleton.create(BindingFactory.binding(), getExecContext())
; 
             }
             throw ex ;
         }

Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/SyntaxVarScope.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/SyntaxVarScope.java?rev=1235954&r1=1235953&r2=1235954&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/SyntaxVarScope.java
(original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/SyntaxVarScope.java
Wed Jan 25 21:16:37 2012
@@ -20,6 +20,7 @@ package com.hp.hpl.jena.sparql.lang;
 
 import java.util.* ;
 
+import com.hp.hpl.jena.query.ARQ ;
 import com.hp.hpl.jena.query.Query ;
 import com.hp.hpl.jena.query.QueryParseException ;
 import com.hp.hpl.jena.query.Syntax ;
@@ -287,7 +288,7 @@ public class SyntaxVarScope
         
         private static void check(Collection<Var> scope, ElementService el)
         {
-            if ( el.getServiceNode().isVariable() )
+            if ( ARQ.isStrictMode() && el.getServiceNode().isVariable() )
             {
                 Var var = Var.alloc(el.getServiceNode()) ;
                 if ( ! scope.contains(var) ) 

Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/arq/qtest.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/arq/qtest.java?rev=1235954&r1=1235953&r2=1235954&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/arq/qtest.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/arq/qtest.java Wed Jan 25 21:16:37 2012
@@ -196,9 +196,9 @@ public class qtest extends CmdARQ
     static void oneManifestEarl(String testManifest)
     {
         String name =  "ARQ" ;
-        String releaseName =  "ARQ2" ;
-        String version = "ARQ-2.2-dev" ; //ARQ.VERSION ;
-        String homepage = "http://jena.sf.net/ARQ" ;
+        String releaseName =  "ARQ" ;
+        String version = "2.9.1-incubating" ;
+        String homepage = "http://incubator.apache.org/jena" ;
         
         // Include information later.
         EarlReport report = new EarlReport(name, version, homepage) ;
@@ -209,7 +209,7 @@ public class qtest extends CmdARQ
         
         // Update the EARL report. 
         Resource jena = model.createResource()
-                    .addProperty(FOAF.homepage, model.createResource("http://jena.sf.net/"))
;
+                    .addProperty(FOAF.homepage, model.createResource("http://incubator.apache.org/jena"))
;
         
         // ARQ is part fo Jena.
         Resource arq = report.getSystem()
@@ -219,7 +219,7 @@ public class qtest extends CmdARQ
         Resource who = model.createResource(FOAF.Person)
                                 .addProperty(FOAF.name, "Andy Seaborne")
                                 .addProperty(FOAF.homepage, 
-                                             model.createResource("http://www.hpl.hp.com/people/afs"))
;
+                                             model.createResource("http://people.apache.org/~andy"))
;
         
         Resource reporter = report.getReporter() ;
         reporter.addProperty(DC.creator, who) ;

Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/junit/EarlReport.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/junit/EarlReport.java?rev=1235954&r1=1235953&r2=1235954&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/junit/EarlReport.java
(original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/junit/EarlReport.java
Wed Jan 25 21:16:37 2012
@@ -34,7 +34,7 @@ import com.hp.hpl.jena.vocabulary.RDF ;
 public class EarlReport
 {
     // Ref: http://www.w3.org/TR/EARL10-Schema/
-    
+    // NB: This vocabulary has changed over time!
     /* An entry looks like:
      * [ rdf:type earl:Assertion;
          earl:assertedBy [ ...] 



Mime
View raw message