You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2016/03/19 12:42:34 UTC
svn commit: r1735757 - in /ofbiz/branches/release15.12: ./
specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Search.groovy
Author: deepak
Date: Sat Mar 19 11:42:34 2016
New Revision: 1735757
URL: http://svn.apache.org/viewvc?rev=1735757&view=rev
Log:
Applied fix from trunk for revision: 1735756
===
(OFBIZ-6859) Fixed Search.groovy, use correct method for analyzer, QueryParser and TopScoreDocCollector.
Thanks Pierre for reporting the issue.
Modified:
ofbiz/branches/release15.12/ (props changed)
ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Search.groovy
Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 19 11:42:34 2016
@@ -9,4 +9,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756
Modified: ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Search.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Search.groovy?rev=1735757&r1=1735756&r2=1735757&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Search.groovy (original)
+++ ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Search.groovy Sat Mar 19 11:42:34 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(), "");