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 2015/12/16 19:40:33 UTC
[2/2] jena git commit: Print FUSEKI_BASE when DEBUG set
Print FUSEKI_BASE when DEBUG set
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/421707f5
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/421707f5
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/421707f5
Branch: refs/heads/master
Commit: 421707f535f3f79f3f66db0565b63ff5391dc7e5
Parents: 047b137
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Dec 16 18:40:14 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Dec 16 18:40:14 2015 +0000
----------------------------------------------------------------------
jena-fuseki2/apache-jena-fuseki/fuseki | 1 +
.../java/org/apache/jena/query/text/TextQueryPF.java | 15 ++++++++++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/421707f5/jena-fuseki2/apache-jena-fuseki/fuseki
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/fuseki b/jena-fuseki2/apache-jena-fuseki/fuseki
index bfb79e1..9ac62f9 100755
--- a/jena-fuseki2/apache-jena-fuseki/fuseki
+++ b/jena-fuseki2/apache-jena-fuseki/fuseki
@@ -315,6 +315,7 @@ RUN_CMD=("$JAVA" "${RUN_ARGS[@]}")
if (( DEBUG ))
then
log_daemon_msg "FUSEKI_HOME = $FUSEKI_HOME"
+ log_daemon_msg "FUSEKI_BASE = $FUSEKI_BASE"
log_daemon_msg "FUSEKI_CONF = $FUSEKI_CONF"
log_daemon_msg "FUSEKI_RUN = $FUSEKI_RUN"
log_daemon_msg "FUSEKI_PID = $FUSEKI_PID"
http://git-wip-us.apache.org/repos/asf/jena/blob/421707f5/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
index e0a8a37..1ad33c4 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
@@ -198,7 +198,20 @@ public class TextQueryPF extends PropertyFunctionBase {
Var scoreVar = (score==null) ? null : Var.alloc(score) ;
Var literalVar = (literal==null) ? null : Var.alloc(literal) ;
List<TextHit> r = query(match.getProperty(), match.getQueryString(), match.getLimit(), execCxt) ;
- Function<TextHit,Binding> converter = new TextHitConverter(binding, sVar, scoreVar, literalVar);
+ //Function<TextHit,Binding> converter = new TextHitConverter(binding, sVar, scoreVar, literalVar);
+
+ Function<TextHit,Binding> converter = (TextHit hit) -> {
+ if (score == null && literal == null)
+ return BindingFactory.binding(binding, sVar, hit.getNode());
+ BindingMap bmap = BindingFactory.create(binding);
+ bmap.add(sVar, hit.getNode());
+ if (scoreVar != null)
+ bmap.add(scoreVar, NodeFactoryExtra.floatToNode(hit.getScore()));
+ if (literalVar != null)
+ bmap.add(literalVar, hit.getLiteral());
+ return bmap;
+ } ;
+
Iterator<Binding> bIter = Iter.map(r.iterator(), converter);
QueryIterator qIter = new QueryIterPlainWrapper(bIter, execCxt);
return qIter ;