svn commit: r1735759 - /ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy

[Deepak Dixit-5]

Author: deepak
Date: Sat Mar 19 11:47:06 2016
New Revision: 1735759

URL: http://svn.apache.org/viewvc?rev=1735759&view=rev
Log:
(OFBIZ-6861) Fixed Search.groovy, use correct method for analyzer, QueryParser and TopScoreDocCollector.

Thanks Pierre for reporting the issue.

Modified:
    ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy

Modified: ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy?rev=1735759&r1=1735758&r2=1735759&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy (original)
+++ ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy Sat Mar 19 11:47:06 2016
@@ -41,9 +41,9 @@ featureIdByType = ParametricSearch.makeF
 combQuery = new BooleanQuery();
 
 try {
-    DirectoryReader reader = DirectoryReader.open(FSDirectory.open(new File(SearchWorker.getIndexPath("content"))));
+    DirectoryReader reader = DirectoryReader.open(FSDirectory.open(new File(SearchWorker.getIndexPath("content")).toPath()));
     searcher = new IndexSearcher(reader);
-    analyzer = new StandardAnalyzer(SearchWorker.LUCENE_VERSION);
+    analyzer = new StandardAnalyzer();
 } catch (java.io.FileNotFoundException e) {
     context.errorMessageList.add(e.getMessage());
     return;
@@ -52,7 +52,7 @@ try {
 if (queryLine || siteId) {
     Query query = null;
     if (queryLine) {
-        QueryParser parser = new QueryParser(SearchWorker.LUCENE_VERSION, "content", analyzer);
+        QueryParser parser = new QueryParser("content", analyzer);
         query = parser.parse(queryLine);
         combQuery.add(query, BooleanClause.Occur.MUST);
     }
@@ -93,7 +93,7 @@ if (searchFeature1 || searchFeature2 ||
     }
 }
 if (searcher) {
-    TopScoreDocCollector collector = TopScoreDocCollector.create(100, false); //defaulting to 100 results
+    TopScoreDocCollector collector = TopScoreDocCollector.create(100); //defaulting to 100 results
     searcher.search(combQuery, collector);
     ScoreDoc[] hits = collector.topDocs().scoreDocs;