diff src/luan/modules/lucene/LuceneIndex.java @ 1459:b04b8fc5f4f4

GoodQueryParser
author Franklin Schmidt <fschmidt@gmail.com>
date Fri, 20 Mar 2020 11:06:53 -0600
parents 6b6c11c9164e
children 13cbce740e1e
line wrap: on
line diff
--- a/src/luan/modules/lucene/LuceneIndex.java	Fri Mar 20 10:58:53 2020 -0600
+++ b/src/luan/modules/lucene/LuceneIndex.java	Fri Mar 20 11:06:53 2020 -0600
@@ -68,7 +68,7 @@
 import org.apache.lucene.search.highlight.SimpleSpanFragmenter;
 import org.apache.lucene.search.highlight.QueryScorer;
 import org.apache.lucene.search.highlight.TokenGroup;
-import goodjava.lucene.queryparser.SaneQueryParser;
+import goodjava.lucene.queryparser.GoodQueryParser;
 import goodjava.lucene.queryparser.FieldParser;
 import goodjava.lucene.queryparser.MultiFieldParser;
 import goodjava.lucene.queryparser.StringFieldParser;
@@ -247,7 +247,7 @@
 	public void delete(String queryStr)
 		throws IOException, ParseException, SQLException, LuanException
 	{
-		Query query = SaneQueryParser.parseQuery(mfp,queryStr);
+		Query query = GoodQueryParser.parseQuery(mfp,queryStr);
 
 		boolean commit = !writeLock.isHeldByCurrentThread();
 		writeLock.lock();
@@ -511,7 +511,7 @@
 		throws LuanException, IOException, ParseException
 	{
 		Utils.checkNotNull(queryStr);
-		Query query = SaneQueryParser.parseQuery(mfp,queryStr);
+		Query query = GoodQueryParser.parseQuery(mfp,queryStr);
 		IndexSearcher searcher = threadLocalSearcher.get();
 		boolean inTransaction = searcher != null;
 		if( !inTransaction )
@@ -543,7 +543,7 @@
 				searcher.search(query,thcc);
 				return thcc.getTotalHits();
 			}
-			Sort sort = sortStr==null ? null : SaneQueryParser.parseSort(mfp,sortStr);
+			Sort sort = sortStr==null ? null : GoodQueryParser.parseSort(mfp,sortStr);
 			TopDocs td = sort==null ? searcher.search(query,n) : searcher.search(query,n,sort);
 			final ScoreDoc[] scoreDocs = td.scoreDocs;
 			DocFn docFn = new DocFn(fn.luan(),searcher,query);
@@ -729,7 +729,7 @@
 	public LuanFunction highlighter(String queryStr,final LuanFunction formatter,final Integer fragmentSize,String dotdotdot)
 		throws ParseException
 	{
-		Query query = SaneQueryParser.parseQuery(mfp,queryStr);
+		Query query = GoodQueryParser.parseQuery(mfp,queryStr);
 		Formatter fmt = new Formatter() {
 			public String highlightTerm(String originalText,TokenGroup tokenGroup) {
 				if( tokenGroup.getTotalScore() <= 0 )