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

[nobody at svn.erp5.org]

Author: ivan
Date: Wed Sep 15 15:44:30 2010
New Revision: 38389

URL: http://svn.erp5.org?rev=38389&view=rev
Log:
Generate proper portal_type syntax.

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=38389&r1=38388&r2=38389&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] Wed Sep 15 15:44:30 2010
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -106,10 +103,12 @@ if portal_type_list == \'all\':\n
 if isinstance(portal_type_list, str):\n
   portal_type_list=[portal_type_list]\n
 if portal_type_list:\n
-  if len(portal_type_list)==1:\n
-    search_string += \' type:"%s"\' % portal_type_list[0]\n
-  else:\n
-    search_string += \' type:(%s)\' %\',\'.join(portal_type_list)\n
+  portal_type_string_list = []\n
+  for portal_type in 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
 \n
 # search by reference\n
 reference = kw.get(\'reference\', request.get(\'reference\', None))\n
@@ -212,8 +211,8 @@ return search_string\n
                             <string>portal_type_list</string>
                             <string>isinstance</string>
                             <string>str</string>
-                            <string>len</string>
-                            <string>_getitem_</string>
+                            <string>portal_type_string_list</string>
+                            <string>portal_type</string>
                             <string>reference</string>
                             <string>version</string>
                             <string>language</string>
@@ -224,6 +223,7 @@ return search_string\n
                             <string>newest</string>
                             <string>search_mode</string>
                             <string>search_mode_map</string>
+                            <string>_getitem_</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=38389&r1=38388&r2=38389&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision [utf8] Wed Sep 15 15:44:30 2010
@@ -1 +1 @@
-1172
\ No newline at end of file
+1173
\ No newline at end of file