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

[de...@apache.org]

Author: deepak
Date: Sat Mar 19 11:40:05 2016
New Revision: 1735756

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

Thanks Pierre for reporting the issue.

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

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Search.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Search.groovy?rev=1735756&r1=1735755&r2=1735756&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Search.groovy (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Search.groovy Sat Mar 19 11:40:05 2016
@@ -52,14 +52,14 @@ featureIdByType = ParametricSearch.makeF
 //Debug.logInfo("in search, featureIdByType:" + featureIdByType, "");
 
 combQuery = new BooleanQuery();
-Directory directory = FSDirectory.open(new File(SearchWorker.getIndexPath("content")));
+Directory directory = FSDirectory.open(new File(SearchWorker.getIndexPath("content")).toPath());
 DirectoryReader reader = DirectoryReader.open(directory);
 IndexSearcher searcher = null;
 Analyzer analyzer = null;
 
 try {
     searcher = new IndexSearcher(reader);
-    analyzer = new StandardAnalyzer(SearchWorker.LUCENE_VERSION);
+    analyzer = new StandardAnalyzer();
 } catch (java.io.FileNotFoundException e) {
     Debug.logError(e, "Search.groovy");
     request.setAttribute("errorMsgReq", "No index file exists.");
@@ -71,7 +71,7 @@ combQuery.add(termQuery, BooleanClause.O
 //Debug.logInfo("in search, combQuery(1):" + combQuery, "");
 if (queryLine && analyzer) {
     Query query = null;
-    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);
 }
@@ -95,7 +95,7 @@ if (featureIdByType) {
 
 if (searcher) {
     Debug.logInfo("in search searchFeature3, combQuery:" + combQuery.toString(), "");
-    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;
     Debug.logInfo("in search, hits:" + collector.getTotalHits(), "");