Author: jacopoc
Date: Thu Feb 27 09:27:10 2014
New Revision: 1572483
URL: http://svn.apache.org/r1572483
Log:
Upgraded lucene component to the latest Lucene release 4.7.0
Added:
ofbiz/trunk/specialpurpose/lucene/lib/lucene-analyzers-common-4.7.0.jar
(with props)
ofbiz/trunk/specialpurpose/lucene/lib/lucene-core-4.7.0.jar (with props)
ofbiz/trunk/specialpurpose/lucene/lib/lucene-queryparser-4.7.0.jar (with
props)
Removed:
ofbiz/trunk/specialpurpose/lucene/lib/lucene-analyzers-common-4.6.0.jar
ofbiz/trunk/specialpurpose/lucene/lib/lucene-core-4.6.0.jar
ofbiz/trunk/specialpurpose/lucene/lib/lucene-queryparser-4.6.0.jar
Modified:
ofbiz/trunk/.classpath
ofbiz/trunk/specialpurpose/LICENSE
ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/SearchProducts.groovy
Modified: ofbiz/trunk/.classpath
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1572483&r1=1572482&r2=1572483&view=diff
==============================================================================
--- ofbiz/trunk/.classpath (original)
+++ ofbiz/trunk/.classpath Thu Feb 27 09:27:10 2014
@@ -158,9 +158,9 @@
<classpathentry kind="lib"
path="specialpurpose/ebaystore/lib/ebaycalls.jar"/>
<classpathentry kind="lib"
path="specialpurpose/ebaystore/lib/ebaysdkcore.jar"/>
<classpathentry kind="lib" path="specialpurpose/ebaystore/lib/helper.jar"/>
- <classpathentry kind="lib"
path="specialpurpose/lucene/lib/lucene-analyzers-common-4.6.0.jar"/>
- <classpathentry kind="lib"
path="specialpurpose/lucene/lib/lucene-core-4.6.0.jar"/>
- <classpathentry kind="lib"
path="specialpurpose/lucene/lib/lucene-queryparser-4.6.0.jar"/>
+ <classpathentry kind="lib"
path="specialpurpose/lucene/lib/lucene-analyzers-common-4.7.0.jar"/>
+ <classpathentry kind="lib"
path="specialpurpose/lucene/lib/lucene-core-4.7.0.jar"/>
+ <classpathentry kind="lib"
path="specialpurpose/lucene/lib/lucene-queryparser-4.7.0.jar"/>
<classpathentry
excluding="org/ofbiz/accounting/thirdparty/cybersource/**|org/ofbiz/accounting/thirdparty/verisign/**|org/ofbiz/accounting/thirdparty/worldpay/**|org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java|org/ofbiz/accounting/thirdparty/orbital/**|org/ofbiz/accounting/thirdparty/securepay/**|org/ofbiz/accounting/thirdparty/ideal/**"
kind="src" path="applications/accounting/src"/>
<classpathentry
excluding="org/ofbiz/content/openoffice/|org/ofbiz/content/report/" kind="src"
path="applications/content/src"/>
<classpathentry kind="src" path="applications/manufacturing/src"/>
Modified: ofbiz/trunk/specialpurpose/LICENSE
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/LICENSE?rev=1572483&r1=1572482&r2=1572483&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/LICENSE (original)
+++ ofbiz/trunk/specialpurpose/LICENSE Thu Feb 27 09:27:10 2014
@@ -16,9 +16,9 @@ specialpurpose/cmssite/template/docbook/
specialpurpose/cmssite/template/docbook/extensions/xalan27.jar
specialpurpose/cmssite/template/docbook/extensions/webhelpindexer.jar
specialpurpose/googlecheckout/lib/checkout-sdk-0.8.8.jar
-specialpurpose/lucene/lib/lucene-analyzers-common-4.6.0.jar
-specialpurpose/lucene/lib/lucene-core-4.6.0.jar
-specialpurpose/lucene/lib/lucene-queryparser-4.6.0.jar
+specialpurpose/lucene/lib/lucene-analyzers-common-4.7.0.jar
+specialpurpose/lucene/lib/lucene-core-4.7.0.jar
+specialpurpose/lucene/lib/lucene-queryparser-4.7.0.jar
=========================================================================
Apache License
Added: ofbiz/trunk/specialpurpose/lucene/lib/lucene-analyzers-common-4.7.0.jar
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/lib/lucene-analyzers-common-4.7.0.jar?rev=1572483&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ofbiz/trunk/specialpurpose/lucene/lib/lucene-analyzers-common-4.7.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ofbiz/trunk/specialpurpose/lucene/lib/lucene-core-4.7.0.jar
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/lib/lucene-core-4.7.0.jar?rev=1572483&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ofbiz/trunk/specialpurpose/lucene/lib/lucene-core-4.7.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ofbiz/trunk/specialpurpose/lucene/lib/lucene-queryparser-4.7.0.jar
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/lib/lucene-queryparser-4.7.0.jar?rev=1572483&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ofbiz/trunk/specialpurpose/lucene/lib/lucene-queryparser-4.7.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/SearchProducts.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/SearchProducts.groovy?rev=1572483&r1=1572482&r2=1572483&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/SearchProducts.groovy
(original)
+++
ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/SearchProducts.groovy
Thu Feb 27 09:27:10 2014
@@ -60,13 +60,14 @@ if (parameters.luceneQuery) {
TopScoreDocCollector collector = TopScoreDocCollector.create(100, false);
// defaulting to 100 results
searcher.search(combQuery, collector);
ScoreDoc[] hits = collector.topDocs().scoreDocs;
-
productList = []
hits.each { hit ->
Document doc = searcher.doc(hit.doc)
productId = doc.productId
product = delegator.findOne("Product", [productId : productId], true)
- productList.add(product)
+ if (product) {
+ productList.add(product)
+ }
}
context.queryResults = productList;
}
