[Erp5-report] r13448 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: romain
Date: Fri Mar 16 10:46:13 2007
New Revision: 13448

URL: http://svn.erp5.org?rev=13448&view=rev
Log:
Restore portal_type parameter to Base_zSearchRelatedObjectsByCategoryList for performance.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zSearchRelatedObjectsByCategoryList.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zSearchRelatedObjectsByCategoryList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zSearchRelatedObjectsByCategoryList.xml?rev=13448&r1=13447&r2=13448&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zSearchRelatedObjectsByCategoryList.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zSearchRelatedObjectsByCategoryList.xml Fri Mar 16 10:46:13 2007
@@ -45,6 +45,12 @@
                                 </value>
                             </item>
                             <item>
+                                <key> <string>portal_type</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
+                            <item>
                                 <key> <string>strict_membership</string> </key>
                                 <value>
                                   <dictionary/>
@@ -64,6 +70,7 @@
                         <value>
                           <list>
 <string>category_list</string>
+<string>portal_type</string>
 <string>strict_membership</string>
 <string>where_expression</string>
 <string>order_by_expression</string>
@@ -84,6 +91,7 @@
         <item>
             <key> <string>arguments_src</string> </key>
             <value> <string>category_list\r\n
+portal_type\r\n
 strict_membership\r\n
 where_expression\r\n
 order_by_expression</string> </value>
@@ -129,6 +137,13 @@
 SELECT DISTINCT catalog.uid, catalog.path, portal_type\n
 FROM catalog, category\n
 WHERE catalog.uid = category.uid\n
+  <dtml-if portal_type>\n
+    AND\n
+    (<dtml-in portal_type>\n
+      <dtml-unless sequence-start> OR </dtml-unless>\n
+        catalog.portal_type=\'<dtml-var sequence-item>\'\n
+    </dtml-in>)\n
+  </dtml-if>\n
   AND (<dtml-var "portal_categories.buildSQLSelector(category_list)">)\n
   <dtml-if strict_membership>\n
     AND category.category_strict_membership = 1\n
@@ -180,6 +195,13 @@
 SELECT DISTINCT catalog.uid, catalog.path, portal_type\n
 FROM catalog, category\n
 WHERE catalog.uid = category.uid\n
+  <dtml-if portal_type>\n
+    AND\n
+    (<dtml-in portal_type>\n
+      <dtml-unless sequence-start> OR </dtml-unless>\n
+        catalog.portal_type=\'<dtml-var sequence-item>\'\n
+    </dtml-in>)\n
+  </dtml-if>\n
   AND (<dtml-var "portal_categories.buildSQLSelector(category_list)">)\n
   <dtml-if strict_membership>\n
     AND category.category_strict_membership = 1\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=13448&r1=13447&r2=13448&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Fri Mar 16 10:46:13 2007
@@ -1,1 +1,1 @@
-268
+271