svn commit: r1735754 - in /ofbiz/branches/release15.12: ./ specialpurpose/lucene/webapp/content/WEB-INF/actions/SearchProducts.groovy

[Deepak Dixit-5]

Author: deepak
Date: Sat Mar 19 11:31:31 2016
New Revision: 1735754

URL: http://svn.apache.org/viewvc?rev=1735754&view=rev
Log:
Applied fix from trunk for revision: 1735753
===

(OFBIZ-6860) Applied patch from jira issue.
============================================================
ProductSearch generates an errorr
============================================================
Thanks   Pierre for reporting issue.

Modified:
    ofbiz/branches/release15.12/   (props changed)
    ofbiz/branches/release15.12/specialpurpose/lucene/webapp/content/WEB-INF/actions/SearchProducts.groovy

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 19 11:31:31 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
+/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

Modified: ofbiz/branches/release15.12/specialpurpose/lucene/webapp/content/WEB-INF/actions/SearchProducts.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/lucene/webapp/content/WEB-INF/actions/SearchProducts.groovy?rev=1735754&r1=1735753&r2=1735754&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/lucene/webapp/content/WEB-INF/actions/SearchProducts.groovy (original)
+++ ofbiz/branches/release15.12/specialpurpose/lucene/webapp/content/WEB-INF/actions/SearchProducts.groovy Sat Mar 19 11:31:31 2016
@@ -38,15 +38,15 @@ if (parameters.luceneQuery) {
     IndexSearcher searcher;
     WhitespaceAnalyzer analyzer;
     try {
-        DirectoryReader reader = DirectoryReader.open(FSDirectory.open(new File(SearchWorker.getIndexPath("products"))));
+        DirectoryReader reader = DirectoryReader.open(FSDirectory.open(new File(SearchWorker.getIndexPath("products")).toPath()));
         searcher = new IndexSearcher(reader);
-        analyzer = new WhitespaceAnalyzer(SearchWorker.LUCENE_VERSION);
+        analyzer = new WhitespaceAnalyzer();
     } catch (FileNotFoundException e) {
         context.errorMessageList.add(e.getMessage());
         return;
     }
 
-    QueryParser parser = new QueryParser(SearchWorker.LUCENE_VERSION, "fullText", analyzer);
+    QueryParser parser = new QueryParser("fullText", analyzer);
     parser.setLocale(locale);
     Query query;
     try {
@@ -57,7 +57,7 @@ if (parameters.luceneQuery) {
     }
     combQuery.add(query, BooleanClause.Occur.MUST);
 
-    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;
     productList = []