svn commit: r1043863 - in /ofbiz/branches/release10.04: ./ applications/product/src/org/ofbiz/product/product/ProductSearch.java

Author: jleroux
Date: Thu Dec  9 08:40:16 2010
New Revision: 1043863

URL: http://svn.apache.org/viewvc?rev=1043863&view=rev
Log:
"Applied fix from trunk for revision: 1043861"
------------------------------------------------------------------------
r1043861 | jleroux | 2010-12-09 09:30:16 +0100 (jeu., 09 déc. 2010) | 12 lines

A patch from Atul Vani "There are issues with search in eCommerce" (https://issues.apache.org/jira/browse/OFBIZ-4032) - OFBIZ-4032

This patch was created for OFBIZ-3789 but worked for me as well on this issues

Try gz-1000 or "gift card" and follow Atul's comment below. I guess it's also an issue for R10.04 (I did not try) R9.04 seems OK. Note that I got no problems with Derby, only with Postgres.

Try searching 'gift card' from http://localhost:8080/ecommerce/control/advancedsearch and using some other value for 'Sorted by' instead of 'Keyword Relevancy'.

The first time i observed this issue KeywordSort was not working for search keyword 'gift' (the console log suggested that SELECT got no 'totalRelevancy' column but the GROUPBY has it in the query) although the KeywordSort was working well for 'gift card'.

All other sorting methods from http://localhost:8080/ecommerce/control/advancedsearch were working for 'gift' but not 'gift card'.

------------------------------------------------------------------------


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/product/ProductSearch.java

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  9 08:40:16 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990
 539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990
 539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861

Modified: ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/product/ProductSearch.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/product/ProductSearch.java?rev=1043863&r1=1043862&r2=1043863&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/product/ProductSearch.java (original)
+++ ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/product/ProductSearch.java Thu Dec  9 08:40:16 2010
@@ -315,8 +315,6 @@ public class ProductSearch {
                     }
                     entityConditionList.add(EntityCondition.makeCondition(keywordOrList, EntityOperator.OR));
 
-                    productIdGroupBy = true;
-
                     if (doingBothAndOr) {
                         relevancyComplexAlias.addComplexAliasMember(new ComplexAliasField(entityAlias, "relevancyWeight", null, "sum"));
                     } else {
@@ -1950,6 +1948,8 @@ public class ProductSearch {
                 // we have to check this in order to be sure that there is a totalRelevancy to sort by...
                 productSearchContext.orderByList.add("-totalRelevancy");
                 productSearchContext.fieldsToSelect.add("totalRelevancy");
+                if (productSearchContext.keywordFixedOrSetAndList.size() > 0)
+                    productSearchContext.productIdGroupBy = true;
             }
         }