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/05/22 15:11:28 UTC
svn commit: r1341460 - in /jena/trunk/jena-arq: ChangeLog.txt
src/main/java/com/hp/hpl/jena/sparql/core/DatasetPrefixStorage.java
src/main/java/com/hp/hpl/jena/sparql/graph/GraphPrefixesProjection.java
src/main/java/org/openjena/riot/system/PrefixMap.java
Author: andy
Date: Tue May 22 13:11:28 2012
New Revision: 1341460
URL: http://svn.apache.org/viewvc?rev=1341460&view=rev
Log:
Remove URI arg from removeFromPrefixMap(String graphName, String prefix, String uri)
Modified:
jena/trunk/jena-arq/ChangeLog.txt
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetPrefixStorage.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphPrefixesProjection.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/PrefixMap.java
Modified: jena/trunk/jena-arq/ChangeLog.txt
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/ChangeLog.txt?rev=1341460&r1=1341459&r2=1341460&view=diff
==============================================================================
--- jena/trunk/jena-arq/ChangeLog.txt (original)
+++ jena/trunk/jena-arq/ChangeLog.txt Tue May 22 13:11:28 2012
@@ -4,8 +4,9 @@ ChangeLog for ARQ
==== ARQ 2.9.1
++ (internal) DatasetPrefixStorage : change removeFromPrefixMap(String, String, String) to removeFromPrefixMap(String, String)
+ Changes for BINDINGS (SPARQL 1.1) - align with SPARQL-WG
- Now called VALUES : slight synatx changes.
+ Now called VALUES : slight syntax changes.
VALUES can be inline data as part of a query pattern.
+ Comprehensive support for date/time/durations operations (JENA-235)
+ Property path syntax revised to align with current SPARQL
@@ -22,6 +23,7 @@ ChangeLog for ARQ
Allow the context to include a set of parameters add to SERVICE requests
(JENA-195)
+ SPARQL 1.1: Complete scope tracking of variables (JENA-142)
++ SPARQL/Trutle alignment: Prefix names can contain ':' unescaped. No escape for ':'
+ Faster writing of XML and JSON results formats (JENA-178)
+ Support for SERVICE with additional parameters (JENA-195)
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetPrefixStorage.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetPrefixStorage.java?rev=1341460&r1=1341459&r2=1341460&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetPrefixStorage.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetPrefixStorage.java Tue May 22 13:11:28 2012
@@ -30,7 +30,10 @@ import com.hp.hpl.jena.shared.PrefixMapp
public interface DatasetPrefixStorage extends Closeable, Sync
{
+ /** Return the set of graph names for which their migh tbe prefix mappings */
public Set<String> graphNames() ;
+
+
public String readPrefix(String graphName, String prefix) ;
public String readByURI(String graphName, String uriStr) ;
public Map<String, String> readPrefixMap(String graphName) ;
@@ -38,10 +41,9 @@ public interface DatasetPrefixStorage ex
public void insertPrefix(String graphName, String prefix, String uri) ;
public void loadPrefixMapping(String graphName, PrefixMapping pmap) ;
- public void removeFromPrefixMap(String graphName, String prefix, String uri) ;
-
-
- /** Return a PrefixMapping for the unamed graph */
+ public void removeFromPrefixMap(String graphName, String prefix) ;
+
+ /** Return a PrefixMapping for the default (unnamed) graph */
public PrefixMapping getPrefixMapping() ;
/** Return a PrefixMapping for a named graph */
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphPrefixesProjection.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphPrefixesProjection.java?rev=1341460&r1=1341459&r2=1341460&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphPrefixesProjection.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphPrefixesProjection.java Tue May 22 13:11:28 2012
@@ -78,7 +78,7 @@ public class GraphPrefixesProjection ext
// Already there - no-op (thanks to Eric Diaz for pointing this out)
return;
// Remove from cache.
- prefixes.removeFromPrefixMap(graphName, prefix, x) ;
+ prefixes.removeFromPrefixMap(graphName, prefix) ;
}
// Persist
prefixes.insertPrefix(graphName, prefix, uri) ;
@@ -104,7 +104,7 @@ public class GraphPrefixesProjection ext
{
String uri = super.getNsPrefixURI(prefix) ;
if ( uri != null )
- prefixes.removeFromPrefixMap(graphName, prefix, uri) ;
+ prefixes.removeFromPrefixMap(graphName, prefix) ;
super.removeNsPrefix(prefix) ;
return this ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/PrefixMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/PrefixMap.java?rev=1341460&r1=1341459&r2=1341460&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/PrefixMap.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/PrefixMap.java Tue May 22 13:11:28 2012
@@ -23,6 +23,8 @@ import java.util.HashMap ;
import java.util.Map ;
import java.util.Map.Entry ;
+import org.openjena.atlas.iterator.Iter ;
+import org.openjena.atlas.lib.ActionKeyValue ;
import org.openjena.atlas.lib.Pair ;
import org.apache.jena.iri.IRI ;
@@ -46,6 +48,22 @@ public class PrefixMap
/** return a copy of the underlying mapping */
public Map<String, IRI> getMappingCopy() { return new HashMap<String, IRI>(prefixes) ; }
+
+ public Map<String, String> getMappingCopyStr()
+ {
+ final Map<String, String> smap = new HashMap<String, String>() ;
+ ActionKeyValue<String, IRI> action = new ActionKeyValue<String, IRI>(){
+ @Override
+ public void apply(String key, IRI value)
+ {
+ String str = value.toString() ;
+ smap.put(key, str) ;
+ }
+ } ;
+ Iter.apply(getMapping(), action) ;
+ return Collections.unmodifiableMap(smap) ;
+ }
+
/** Add a prefix, overwites any existing association */
public void add(String prefix, String iriString)