[66/68] [abbrv] git commit: JENA-802 : Handle blank nodes in the same way that jena-text does

2014-10-22 Thread rvesse 
JENA-802 : Handle blank nodes in the same way that jena-text does


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/17a2537b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/17a2537b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/17a2537b

Branch: refs/heads/hadoop-rdf
Commit: 17a2537bbe5fe7858e1d854c690e72a0108bd532
Parents: ec0d19c
Author: Andy Seaborne a...@apache.org
Authored: Tue Oct 21 19:43:21 2014 +0100
Committer: Andy Seaborne a...@apache.org
Committed: Tue Oct 21 19:43:21 2014 +0100

--
 .../jena/query/spatial/SpatialIndexContext.java |  5 +-
 .../jena/query/spatial/SpatialIndexLucene.java  |  8 +--
 .../jena/query/spatial/SpatialIndexSolr.java| 49 
 .../jena/query/spatial/SpatialQueryFuncs.java   | 61 
 .../apache/jena/query/text/TextQueryFuncs.java  |  2 +-
 5 files changed, 91 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/jena/blob/17a2537b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexContext.java
--
diff --git 
a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexContext.java
 
b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexContext.java
index 63b9b7e..42c8b76 100644
--- 
a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexContext.java
+++ 
b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexContext.java
@@ -24,6 +24,8 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.jena.atlas.logging.Log ;
+
 import com.hp.hpl.jena.graph.Node;
 import com.spatial4j.core.shape.Shape;
 
@@ -46,7 +48,8 @@ public class SpatialIndexContext {
return;
}
 
-   String x = (s.isURI()) ? s.getURI() : s.getBlankNodeLabel();
+   String x = SpatialQueryFuncs.subjectToString(s) ;
+   Log.info(getClass(), Subject: +x) ;
 
if (defn.isSpatialPredicate(p)  
SpatialValueUtil.isDecimal(o.getLiteral())) {
 

http://git-wip-us.apache.org/repos/asf/jena/blob/17a2537b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java
--
diff --git 
a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java
 
b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java
index cbaf99d..f515d6e 100644
--- 
a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java
+++ 
b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java
@@ -42,8 +42,6 @@ import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
 
 import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.graph.NodeFactory ;
-import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
 import com.spatial4j.core.shape.Point ;
 import com.spatial4j.core.shape.Shape ;
 
@@ -219,7 +217,7 @@ public class SpatialIndexLucene implements SpatialIndex {
Document doc = indexSearcher.doc(sd.doc);
String[] values = 
doc.getValues(docDef.getEntityField());
for (String v : values) {
-   Node n = NodeFactory.createURI(v);
+   Node n = SpatialQueryFuncs.stringToNode(v) ;
results.add(n);
}
}
@@ -231,10 +229,6 @@ public class SpatialIndexLucene implements SpatialIndex {
return docDef;
}
 
-   private Node entryToNode(String v) {
-   // TEMP
-   return NodeFactoryExtra.createLiteralNode(v, null, null);
-   }
 
private static void exception(Exception ex) {
throw new SpatialIndexException(ex);

http://git-wip-us.apache.org/repos/asf/jena/blob/17a2537b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexSolr.java
--
diff --git 
a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexSolr.java
 
b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexSolr.java
index 50f1b61..7363a3d 100644
--- 
a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexSolr.java
+++ 
b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexSolr.java
@@ -18,28 +18,27 @@
 
 package org.apache.jena.query.spatial;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.lucene.spatial.SpatialStrategy;
-import org.apache.lucene.spatial.prefix.RecursivePrefixTreeStrategy;
-import org.apache.lucene.spatial.prefix.tree.GeohashPrefixTree;

git commit: JENA-802 : Handle blank nodes in the same way that jena-text does

2014-10-21 Thread andy 
Repository: jena
Updated Branches:
  refs/heads/master ec0d19cc7 - 17a2537bb


JENA-802 : Handle blank nodes in the same way that jena-text does


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/17a2537b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/17a2537b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/17a2537b

Branch: refs/heads/master
Commit: 17a2537bbe5fe7858e1d854c690e72a0108bd532
Parents: ec0d19c
Author: Andy Seaborne a...@apache.org
Authored: Tue Oct 21 19:43:21 2014 +0100
Committer: Andy Seaborne a...@apache.org
Committed: Tue Oct 21 19:43:21 2014 +0100

--
 .../jena/query/spatial/SpatialIndexContext.java |  5 +-
 .../jena/query/spatial/SpatialIndexLucene.java  |  8 +--
 .../jena/query/spatial/SpatialIndexSolr.java| 49 
 .../jena/query/spatial/SpatialQueryFuncs.java   | 61 
 .../apache/jena/query/text/TextQueryFuncs.java  |  2 +-
 5 files changed, 91 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/jena/blob/17a2537b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexContext.java
--
diff --git 
a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexContext.java
 
b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexContext.java
index 63b9b7e..42c8b76 100644
--- 
a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexContext.java
+++ 
b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexContext.java
@@ -24,6 +24,8 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.jena.atlas.logging.Log ;
+
 import com.hp.hpl.jena.graph.Node;
 import com.spatial4j.core.shape.Shape;
 
@@ -46,7 +48,8 @@ public class SpatialIndexContext {
return;
}
 
-   String x = (s.isURI()) ? s.getURI() : s.getBlankNodeLabel();
+   String x = SpatialQueryFuncs.subjectToString(s) ;
+   Log.info(getClass(), Subject: +x) ;
 
if (defn.isSpatialPredicate(p)  
SpatialValueUtil.isDecimal(o.getLiteral())) {
 

http://git-wip-us.apache.org/repos/asf/jena/blob/17a2537b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java
--
diff --git 
a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java
 
b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java
index cbaf99d..f515d6e 100644
--- 
a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java
+++ 
b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java
@@ -42,8 +42,6 @@ import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
 
 import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.graph.NodeFactory ;
-import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
 import com.spatial4j.core.shape.Point ;
 import com.spatial4j.core.shape.Shape ;
 
@@ -219,7 +217,7 @@ public class SpatialIndexLucene implements SpatialIndex {
Document doc = indexSearcher.doc(sd.doc);
String[] values = 
doc.getValues(docDef.getEntityField());
for (String v : values) {
-   Node n = NodeFactory.createURI(v);
+   Node n = SpatialQueryFuncs.stringToNode(v) ;
results.add(n);
}
}
@@ -231,10 +229,6 @@ public class SpatialIndexLucene implements SpatialIndex {
return docDef;
}
 
-   private Node entryToNode(String v) {
-   // TEMP
-   return NodeFactoryExtra.createLiteralNode(v, null, null);
-   }
 
private static void exception(Exception ex) {
throw new SpatialIndexException(ex);

http://git-wip-us.apache.org/repos/asf/jena/blob/17a2537b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexSolr.java
--
diff --git 
a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexSolr.java
 
b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexSolr.java
index 50f1b61..7363a3d 100644
--- 
a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexSolr.java
+++ 
b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexSolr.java
@@ -18,28 +18,27 @@
 
 package org.apache.jena.query.spatial;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.lucene.spatial.SpatialStrategy;
-import