[Erp5-report] r38402 ivan - in /erp5/trunk/bt5/erp5_dms: SkinTemplateItem/portal_skins/erp5...

[nobody at svn.erp5.org]

Author: ivan
Date: Thu Sep 16 09:54:39 2010
New Revision: 38402

URL: http://svn.erp5.org?rev=38402&view=rev
Log:
Generate search string following this format:
<existing_search_string> OPERATOR (portal_type:value1 OR portal_type:value2)

rather than as before:

<existing_search_string> portal_type:value1 OR portal_type:value2

which have a totally different meaning and generates a wrong query.
Make sure that OPERATOR is configurable (default='AND')

Modified:
    erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_assembleSearchString.xml
    erp5/trunk/bt5/erp5_dms/bt/revision

Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_assembleSearchString.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_assembleSearchString.xml?rev=38402&r1=38401&r2=38402&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_assembleSearchString.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_assembleSearchString.xml [utf8] Thu Sep 16 09:54:39 2010
@@ -108,7 +108,7 @@ if portal_type_list:\n
     if \' \' in portal_type:\n
       portal_type = \'"%s"\' %portal_type\n
     portal_type_string_list.append(\'portal_type:%s\' %portal_type)\n
-  search_string += \' %s\' %\' OR \'.join(portal_type_string_list)\n
+  search_string += \' %s (%s)\' %(logical_operator, \' OR \'.join(portal_type_string_list))\n
 \n
 # search by reference\n
 reference = kw.get(\'reference\', request.get(\'reference\', None))\n
@@ -166,7 +166,7 @@ return search_string\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>**kw</string> </value>
+            <value> <string>logical_operator=\'AND\', **kw</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -186,12 +186,13 @@ return search_string\n
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>0</int> </value>
+                        <value> <int>1</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
                         <value>
                           <tuple>
+                            <string>logical_operator</string>
                             <string>kw</string>
                             <string>None</string>
                             <string>MARKER</string>
@@ -235,7 +236,9 @@ return search_string\n
         <item>
             <key> <string>func_defaults</string> </key>
             <value>
-              <none/>
+              <tuple>
+                <string>AND</string>
+              </tuple>
             </value>
         </item>
         <item>

Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=38402&r1=38401&r2=38402&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision [utf8] Thu Sep 16 09:54:39 2010
@@ -1 +1 @@
-1173
\ No newline at end of file
+1175
\ No newline at end of file