jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From codefer...@apache.org
Subject [2/2] jena git commit: JEAN-1645 Merge commit 'refs/pull/503/head' of https://github.com/apache/jena. This closes #503
Date Thu, 06 Dec 2018 22:39:58 GMT
JEAN-1645 Merge commit 'refs/pull/503/head' of https://github.com/apache/jena. This closes
#503


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

Branch: refs/heads/master
Commit: 501d9f68d46e30ce5289b04dfba13f07bbf7d2d9
Parents: 31995c7 52d959c
Author: Code Ferret <codeferret@apache.org>
Authored: Thu Dec 6 13:15:08 2018 -0600
Committer: Code Ferret <codeferret@apache.org>
Committed: Thu Dec 6 13:15:08 2018 -0600

----------------------------------------------------------------------
 .../org/apache/jena/query/text/TextIndex.java   |  6 +-
 .../apache/jena/query/text/TextIndexLucene.java | 39 +++++++--
 .../org/apache/jena/query/text/TextQueryPF.java | 85 ++++++++++++++------
 3 files changed, 101 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/501d9f68/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
----------------------------------------------------------------------
diff --cc jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
index b217c8a,f449f85..00a9a88
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
@@@ -653,14 -677,18 +681,15 @@@ public class TextIndexLucene implement
          
          String queryString = textClause ;
  
 -        if (graphClause != null)
 -            queryString = "(" + queryString + ") AND " + graphClause ;
 +        if (graphURI != null) {
 +            String escaped = QueryParserBase.escape(graphURI) ;
 +            queryString = "(" + queryString + ") AND " + getDocDef().getGraphField() + ":"
+ escaped ;
 +        }
          
          Analyzer qa = getQueryAnalyzer(usingSearchFor, lang);
-         Query query = parseQuery(queryString, qa) ;
-         
+         Query textQuery = parseQuery(queryString, qa);
+         Query query = textQueryExtender.apply(textQuery);
+ 
          if ( limit <= 0 )
              limit = MAX_N ;
  


Mime
View raw message