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:48:43 UTC
svn commit: r1549588 - in /jena/trunk/jena-text/src/main/java: jena/
org/apache/jena/query/text/
Author: andy
Date: Mon Dec 9 14:48:43 2013
New Revision: 1549588
URL: http://svn.apache.org/r1549588
Log:
TextQueryFuncs as separate place of support functions
Modified:
jena/trunk/jena-text/src/main/java/jena/textindexer.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/TextDocProducerTriples.java
jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextIndexSolr.java
jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextQuery.java
jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
Modified: jena/trunk/jena-text/src/main/java/jena/textindexer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-text/src/main/java/jena/textindexer.java?rev=1549588&r1=1549587&r2=1549588&view=diff
==============================================================================
--- jena/trunk/jena-text/src/main/java/jena/textindexer.java (original)
+++ jena/trunk/jena-text/src/main/java/jena/textindexer.java Mon Dec 9 14:48:43 2013
@@ -121,7 +121,7 @@ public class textindexer extends CmdARQ
Iterator<Quad> quadIter = dataset.find(Node.ANY, Node.ANY, property, Node.ANY) ;
for (; quadIter.hasNext();) {
Quad quad = quadIter.next() ;
- Entity entity = TextQuery.entityFromQuad(entityDefinition, quad) ;
+ Entity entity = TextQueryFuncs.entityFromQuad(entityDefinition, quad) ;
if (entity != null) {
textIndex.addEntity(entity) ;
progressMonitor.progressByOne() ;
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=1549588&r1=1549587&r2=1549588&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:48:43 2013
@@ -72,8 +72,8 @@ public class TextDocProducerEntities ext
private void docEntity(Node g, Node s, List<Quad> batch) {
// One document per entity
- String x = TextQuery.subjectToString(s) ;
- String gx = TextQuery.graphNodeToString(g) ;
+ String x = TextQueryFuncs.subjectToString(s) ;
+ String gx = TextQueryFuncs.graphNodeToString(g) ;
Entity entity = new Entity(x, gx) ;
String graphField = defn.getGraphField() ;
if ( defn.getGraphField() != null )
@@ -104,7 +104,7 @@ public class TextDocProducerEntities ext
// One document per triple/quad
for ( Quad quad : batch ) {
- Entity entity = TextQuery.entityFromQuad(defn, quad) ;
+ Entity entity = TextQueryFuncs.entityFromQuad(defn, quad) ;
if ( entity != null )
indexer.addEntity(entity) ;
}
Modified: jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerTriples.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerTriples.java?rev=1549588&r1=1549587&r2=1549588&view=diff
==============================================================================
--- jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerTriples.java (original)
+++ jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerTriples.java Mon Dec 9 14:48:43 2013
@@ -53,7 +53,7 @@ public class TextDocProducerTriples impl
if ( qaction != QuadAction.ADD )
return ;
- Entity entity = TextQuery.entityFromQuad(defn, g, s, p, o) ;
+ Entity entity = TextQueryFuncs.entityFromQuad(defn, g, s, p, o) ;
if ( entity != null )
// Null means does not match defn
indexer.addEntity(entity) ;
Modified: jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java?rev=1549588&r1=1549587&r2=1549588&view=diff
==============================================================================
--- jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java (original)
+++ jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java Mon Dec 9 14:48:43 2013
@@ -269,7 +269,7 @@ public class TextIndexLucene implements
Document doc = indexSearcher.doc(sd.doc) ;
String[] values = doc.getValues(docDef.getEntityField()) ;
for ( String v : values ) {
- Node n = TextQuery.stringToNode(v) ;
+ Node n = TextQueryFuncs.stringToNode(v) ;
results.add(n) ;
}
}
Modified: jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextIndexSolr.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextIndexSolr.java?rev=1549588&r1=1549587&r2=1549588&view=diff
==============================================================================
--- jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextIndexSolr.java (original)
+++ jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextIndexSolr.java Mon Dec 9 14:48:43 2013
@@ -174,7 +174,7 @@ public class TextIndexSolr implements Te
{
String str = (String)sd.getFieldValue(docDef.getEntityField()) ;
//log.info("Entity: "+uriStr) ;
- Node n = TextQuery.stringToNode(str) ;
+ Node n = TextQueryFuncs.stringToNode(str) ;
results.add(n) ;
}
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=1549588&r1=1549587&r2=1549588&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:48:43 2013
@@ -18,21 +18,15 @@
package org.apache.jena.query.text;
-import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.query.text.assembler.TextAssembler ;
-import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.graph.NodeFactory ;
-import com.hp.hpl.jena.rdf.model.AnonId ;
import com.hp.hpl.jena.sparql.SystemARQ ;
-import com.hp.hpl.jena.sparql.core.Quad ;
import com.hp.hpl.jena.sparql.lib.Metadata ;
import com.hp.hpl.jena.sparql.mgt.ARQMgt ;
import com.hp.hpl.jena.sparql.mgt.SystemInfo ;
import com.hp.hpl.jena.sparql.pfunction.PropertyFunction ;
import com.hp.hpl.jena.sparql.pfunction.PropertyFunctionFactory ;
import com.hp.hpl.jena.sparql.pfunction.PropertyFunctionRegistry ;
-import com.hp.hpl.jena.sparql.util.FmtUtils ;
import com.hp.hpl.jena.sparql.util.Symbol ;
import com.hp.hpl.jena.tdb.TDB ;
@@ -76,67 +70,6 @@ public class TextQuery
});
}
}
-
- public static String subjectToString(Node s) {
- if ( s == null )
- throw new IllegalArgumentException("Subject node can not be null") ;
- if ( ! (s.isURI() || s.isBlank() ) )
- throw new TextIndexException("Found a subject that is not a URI nor a blank node: "+s) ;
- return nodeToString(s) ;
- }
-
- public static String graphNodeToString(Node g) {
- if ( g == null )
- return null ;
- if ( ! (g.isURI() || g.isBlank() ) )
- throw new TextIndexException("Found a graph label that is not a URI nor a blank node: "+g) ;
- return nodeToString(g) ;
- }
-
- private static String nodeToString(Node n) {
- return (n.isURI() ) ? n.getURI() : "_:" + n.getBlankNodeLabel() ;
- }
-
- /** Reverse the translation of Nodes to string stored in indexes */
- public static Node stringToNode(String v) {
- if ( v.startsWith("_:") ) {
- v = v.substring("_:".length()) ;
- return NodeFactory.createAnon(new AnonId(v)) ;
- }
- else
- return NodeFactory.createURI(v) ;
- }
-
- /** Create an Entity from a quad.
- * Returns null if the quad is not a candidate for indexing.
- */
- public static Entity entityFromQuad(EntityDefinition defn , Quad quad ) {
- return entityFromQuad(defn, quad.getGraph(), quad.getSubject(), quad.getPredicate(), quad.getObject()) ;
- }
-
- /** Create an Entity from a quad (as g/s/p/o).
- * Returns null if the quad is not a candidate for indexing.
- */
- public static Entity entityFromQuad(EntityDefinition defn , Node g , Node s , Node p , Node o ) {
- String field = defn.getField(p) ;
- if ( field == null )
- return null ;
-
- String x = TextQuery.subjectToString(s) ;
- 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 + " :: "
- + FmtUtils.stringForString(field)) ;
- return null ;
- }
- entity.put(field, o.getLiteralLexicalForm()) ;
- return entity ;
- }
}
Modified: jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java?rev=1549588&r1=1549587&r2=1549588&view=diff
==============================================================================
--- jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java (original)
+++ jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java Mon Dec 9 14:48:43 2013
@@ -190,7 +190,7 @@ public class TextQueryPF extends Propert
if (!Quad.isUnionGraph(activeGraph.getGraphName())) {
String uri =
activeGraph.getGraphName() != null
- ? TextQuery.graphNodeToString(activeGraph.getGraphName())
+ ? TextQueryFuncs.graphNodeToString(activeGraph.getGraphName())
: Quad.defaultGraphNodeGenerated.getURI() ;
String escaped = QueryParser.escape(uri) ;
String qs2 = server.getDocDef().getGraphField() + ":" + escaped ;