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 2014/04/04 10:10:06 UTC
svn commit: r1584559 - in
/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql:
core/Prologue.java sse/lang/ParseHandlerResolver.java
Author: andy
Date: Fri Apr 4 08:10:06 2014
New Revision: 1584559
URL: http://svn.apache.org/r1584559
Log:
JENA-670 : deal with prefix expansion that expands to the same string
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Prologue.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerResolver.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Prologue.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Prologue.java?rev=1584559&r1=1584558&r2=1584559&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Prologue.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Prologue.java Fri Apr 4 08:10:06 2014
@@ -179,16 +179,23 @@ public class Prologue
/** Expand prefixed name
*
- * @param qname The prefixed name to be expanded
+ * @param prefixed The prefixed name to be expanded
* @return URI, or null if not expanded.
*/
- public String expandPrefixedName(String qname)
+ public String expandPrefixedName(String prefixed)
{
- String s = prefixMap.expandPrefix(qname) ;
- if ( s.equals(qname) )
+ //From PrefixMappingImpl.expandPrefix( String prefixed )
+ int colon = prefixed.indexOf( ':' );
+ if (colon < 0)
return null ;
- return s ;
+ else {
+ String prefix = prefixed.substring( 0, colon ) ;
+ String uri = prefixMap.getNsPrefixURI(prefix);
+ if ( uri == null )
+ return null ;
+ return uri + prefixed.substring( colon + 1 );
+ }
}
/** Use the prefix map to turn a URI into a qname, or return the original URI */
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerResolver.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerResolver.java?rev=1584559&r1=1584558&r2=1584559&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerResolver.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerResolver.java Fri Apr 4 08:10:06 2014
@@ -178,8 +178,8 @@ public class ParseHandlerResolver extend
if ( ! StrUtils.contains(pname, ":") )
throwException("Prefixed name does not have a ':': "+pname, line, column) ;
- String uri = prologue.getPrefixMapping().expandPrefix(pname) ;
- if ( uri == null || uri.equals(pname) )
+ String uri = prologue.expandPrefixedName(pname) ;
+ if ( uri == null )
throwException("Can't resolve prefixed name: "+pname, line, column) ;
return uri ;
}