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 2011/08/10 17:03:31 UTC
svn commit: r1156212 - in /incubator/jena/Jena2/ARQ/trunk:
src-test/org/openjena/riot/out/TestOutput.java
src/org/openjena/riot/system/PrefixMap.java
Author: andy
Date: Wed Aug 10 15:03:31 2011
New Revision: 1156212
URL: http://svn.apache.org/viewvc?rev=1156212&view=rev
Log: (empty)
Modified:
incubator/jena/Jena2/ARQ/trunk/src-test/org/openjena/riot/out/TestOutput.java
incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/system/PrefixMap.java
Modified: incubator/jena/Jena2/ARQ/trunk/src-test/org/openjena/riot/out/TestOutput.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src-test/org/openjena/riot/out/TestOutput.java?rev=1156212&r1=1156211&r2=1156212&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src-test/org/openjena/riot/out/TestOutput.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src-test/org/openjena/riot/out/TestOutput.java Wed Aug 10 15:03:31 2011
@@ -30,7 +30,7 @@ public class TestOutput extends BaseTest
prologue.getPrefixMap().add("rdfs", "http://www.w3.org/2000/01/rdf-schema#") ;
prologue.getPrefixMap().add("owl", "http://www.w3.org/2002/07/owl#") ;
prologue.getPrefixMap().add("xsd", "http://www.w3.org/2001/XMLSchema#") ;
- prologue.getPrefixMap().add("x", "http://example/a") ;
+ prologue.getPrefixMap().add("x", "http://example/ns/a") ;
}
@@ -40,7 +40,7 @@ public class TestOutput extends BaseTest
@Test public void output_03() { testStringForNode("'abc'@en") ; }
- @Test public void output_04() { testStringForNode("'abc'^^<http://exmaple/dt>") ; }
+ @Test public void output_04() { testStringForNode("'abc'^^<http://example/dt>") ; }
@Test public void output_05() { testStringForNode("'é'", "\"\\u00E9\"") ; }
@@ -48,7 +48,7 @@ public class TestOutput extends BaseTest
@Test public void output_10() { testStringForNode("<http://example/>", ":", prologue) ; }
- @Test public void output_11() { testStringForNode("<http://example/abc>", "x:bc", prologue) ; }
+ @Test public void output_11() { testStringForNode("<http://example/ns/abc>", "x:bc", prologue) ; }
@Test public void output_12() { testStringForNode("123", "\"123\"^^xsd:integer", prologue) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/system/PrefixMap.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/system/PrefixMap.java?rev=1156212&r1=1156211&r2=1156212&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/system/PrefixMap.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/system/PrefixMap.java Wed Aug 10 15:03:31 2011
@@ -83,11 +83,18 @@ public class PrefixMap
String prefix = e.getValue().toString() ;
if ( uriStr.startsWith(prefix) )
- return e.getKey()+":"+uriStr.substring(prefix.length()) ;
+ {
+ String ln = uriStr.substring(prefix.length()) ;
+ if ( strSafeFor(ln, '/') && strSafeFor(ln, '#') && strSafeFor(ln, ':') )
+ return e.getKey()+":"+ln ;
+ }
}
return null ;
}
+ private static boolean strSafeFor(String str, char ch) { return str.indexOf(ch) == -1 ; }
+
+
/** Abbreviate an IRI or retrn null */
public Pair<String, String> abbrev(String uriStr)
{