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 2013/12/09 15:37:02 UTC
svn commit: r1549587 - in /jena/trunk/jena-text/src/main/java:
jena/textindexdump.java
org/apache/jena/query/text/TextDocProducerEntities.java
org/apache/jena/query/text/TextQuery.java
Author: andy
Date: Mon Dec 9 14:37:02 2013
New Revision: 1549587
URL: http://svn.apache.org/r1549587
Log:
More careful about indexing graphs
Modified:
jena/trunk/jena-text/src/main/java/jena/textindexdump.java
jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerEntities.java
jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextQuery.java
Modified: jena/trunk/jena-text/src/main/java/jena/textindexdump.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-text/src/main/java/jena/textindexdump.java?rev=1549587&r1=1549586&r2=1549587&view=diff
==============================================================================
--- jena/trunk/jena-text/src/main/java/jena/textindexdump.java (original)
+++ jena/trunk/jena-text/src/main/java/jena/textindexdump.java Mon Dec 9 14:37:02 2013
@@ -109,7 +109,7 @@ public class textindexdump extends CmdAR
for ( ScoreDoc sd : sDocs ) {
System.out.println("Doc: "+sd.doc) ;
Document doc = indexSearcher.doc(sd.doc) ;
- //System.out.println(doc) ;
+ // Don't formget that many feilds aren't stored, just indexed.
for ( IndexableField f : doc ) {
//System.out.println(" "+f) ;
System.out.println(" "+f.name()+" = "+f.stringValue()) ;
Modified: jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerEntities.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerEntities.java?rev=1549587&r1=1549586&r2=1549587&view=diff
==============================================================================
--- jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerEntities.java (original)
+++ jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerEntities.java Mon Dec 9 14:37:02 2013
@@ -65,6 +65,7 @@ public class TextDocProducerEntities ext
Node g = q.getGraph() ;
Node s = q.getSubject() ;
docEntity(g, s, batch) ;
+ return ;
}
docQuads(batch) ; // Does not need batching.
}
@@ -74,6 +75,10 @@ public class TextDocProducerEntities ext
String x = TextQuery.subjectToString(s) ;
String gx = TextQuery.graphNodeToString(g) ;
Entity entity = new Entity(x, gx) ;
+ String graphField = defn.getGraphField() ;
+ if ( defn.getGraphField() != null )
+ entity.put(graphField, gx) ;
+
for ( Quad quad : batch ) {
Node p = quad.getPredicate() ;
String field = defn.getField(p) ;
Modified: jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextQuery.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextQuery.java?rev=1549587&r1=1549586&r2=1549587&view=diff
==============================================================================
--- jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextQuery.java (original)
+++ jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextQuery.java Mon Dec 9 14:37:02 2013
@@ -123,8 +123,11 @@ public class TextQuery
return null ;
String x = TextQuery.subjectToString(s) ;
- String graph = TextQuery.graphNodeToString(g) ;
- Entity entity = new Entity(x, graph) ;
+ String graphText = TextQuery.graphNodeToString(g) ;
+ Entity entity = new Entity(x, graphText) ;
+ String graphField = defn.getGraphField() ;
+ if ( defn.getGraphField() != null )
+ entity.put(graphField, graphText) ;
if ( !o.isLiteral() ) {
Log.warn(TextQuery.class, "Not a literal value for mapped field-predicate: " + field + " :: "