Merge commit 'refs/pull/136/head' of github.com:apache/jena

This closes #136.
apache · Apr 21, 2016 · 316772c · 316772c
2 parents 952fa27 + 20703b0
commit 316772c
Show file tree

Hide file tree

Showing 10 changed files with 279 additions and 222 deletions.
diff --git a/jena-arq/src/main/java/org/apache/jena/query/ARQ.java b/jena-arq/src/main/java/org/apache/jena/query/ARQ.java
@@ -19,6 +19,7 @@
 package org.apache.jena.query;
 
 import org.apache.jena.riot.RIOT ;
+import org.apache.jena.riot.system.RiotLib ;
 import org.apache.jena.sparql.SystemARQ ;
 import org.apache.jena.sparql.algebra.optimize.TransformOrderByDistinctApplication ;
 import org.apache.jena.sparql.core.assembler.AssemblerUtils ;
@@ -251,6 +252,14 @@ public static void enableBlankNodeResultLabels(boolean val)
 
     public static final Symbol serviceAllowed = Service.serviceAllowed ;
 
+    /** If set to true, the parsers will convert undefined prefixes to a URI
+     * according to the fixup function {@link RiotLib#fixupPrefixes}.
+     * Normally, unset (which equates to false).
+     * 
+     * @see RiotLib#isPrefixIRI
+     */
+    public static final Symbol fixupUndefinedPrefixes   = SystemARQ.allocSymbol("fixupPrefixes") ;
+
     /**
      * A Long value that specifies the number of bindings (or triples for CONSTRUCT queries) to be stored in memory by sort
      * operations or hash tables before switching to temporary disk files.  The value defaults to -1, which will always

diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java
@@ -26,6 +26,7 @@
 import org.apache.jena.graph.NodeFactory ;
 import org.apache.jena.graph.Triple ;
 import org.apache.jena.iri.IRI ;
+import org.apache.jena.query.ARQ ;
 import org.apache.jena.riot.RiotException ;
 import org.apache.jena.riot.SysRIOT ;
 import org.apache.jena.riot.tokens.Token ;
@@ -217,8 +218,11 @@ private static Node create(ParserProfile pp, Node currentGraph, Token token) {
 
     private static String expandPrefixedName(ParserProfile pp, String prefix, String localPart, Token token) {
         String expansion = pp.getPrologue().getPrefixMap().expand(prefix, localPart) ;
-        if (expansion == null)
+        if (expansion == null) {
+            if ( ARQ.isTrue(ARQ.fixupUndefinedPrefixes) )
+                return RiotLib.fixupPrefixIRI(prefix, localPart) ;
             pp.getHandler().fatal("Undefined prefix: " + prefix, token.getLine(), token.getColumn()) ;
+        }
         return expansion ;
     }
 

diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileChecker.java b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileChecker.java
@@ -103,7 +103,9 @@ private void checkQuad(Node graph, Node subject, Node predicate, Node object, lo
 
     @Override
     public Node createURI(String x, long line, long col) {
-        if ( ! RiotLib.isBNodeIRI(x) )
+        if ( RiotLib.isBNodeIRI(x) ) {}
+        else if ( RiotLib.isPrefixIRI(x) ) {}
+        else
             x = resolveIRI(x, line, col) ;
         return super.createURI(x, line, col) ;
     }

diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java b/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
@@ -29,6 +29,8 @@
 import java.io.OutputStream ;
 import java.io.Writer ;
 import java.util.* ;
+import java.util.function.Function ;
+import java.util.function.Predicate ;
 
 import org.apache.jena.atlas.io.IndentedWriter ;
 import org.apache.jena.atlas.iterator.Iter ;
@@ -38,7 +40,10 @@
 import org.apache.jena.graph.NodeFactory ;
 import org.apache.jena.graph.Triple ;
 import org.apache.jena.query.ARQ ;
-import org.apache.jena.riot.* ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.SysRIOT ;
+import org.apache.jena.riot.WriterDatasetRIOT ;
 import org.apache.jena.riot.lang.LabelToNode ;
 import org.apache.jena.riot.tokens.Token ;
 import org.apache.jena.riot.tokens.Tokenizer ;
@@ -73,12 +78,39 @@ public static Node createIRIorBNode(String iri)
         return NodeFactory.createURI(iri) ;
     }
 
-    /** Test whether  */
-    public static boolean isBNodeIRI(String iri)
-    {
+    /** Test whether a IRI is a ARQ-encoded blank node. */
+    public static boolean isBNodeIRI(String iri) {
         return skolomizedBNodes && iri.startsWith(bNodeLabelStart) ;
     }
 
+    private static final String URI_PREFIX_FIXUP = "::";
+
+    // These two must be in-step.
+    /** Function applied to undefined prefixes to convert to a URI string */  
+    public static final Function<String,String> fixupPrefixes      = (x) -> URI_PREFIX_FIXUP.concat(x) ;
+
+    /** Function to test for undefined prefix URIs*/  
+    public static final Predicate<String> testFixupedPrefixURI     = (x) -> x.startsWith(URI_PREFIX_FIXUP) ;
+
+    /** Test whether a IRI is a ARQ-encoded blank node. */
+    public static boolean isPrefixIRI(String iri) {
+        return testFixupedPrefixURI.test(iri) ;
+    }
+
+    /** Convert an prefix name (qname) to an IRI, for when the prerix is nor defined.
+     * @see ARQ#fixupUndefinedPrefixes
+     */
+    public static String fixupPrefixIRI(String prefix, String localPart) {
+        return fixupPrefixIRI(prefix+":"+localPart) ;
+    }
+
+    /** Convert an prefix name (qname) to an IRI, for when the prerix is nor defined.
+     * @see ARQ#fixupUndefinedPrefixes
+     */
+    public static String fixupPrefixIRI(String prefixedName) {
+        return fixupPrefixes.apply(prefixedName) ;
+    }
+
     private static ParserProfile profile = profile(RDFLanguages.TURTLE, null, ErrorHandlerFactory.errorHandlerStd) ;
     static {
         PrefixMap pmap = profile.getPrologue().getPrefixMap() ;