Commit bb11d071 authored by Romain Courteaud's avatar Romain Courteaud

Restore portal_type parameter to Base_zSearchRelatedObjectsByCategoryList for performance.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@13448 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent f7186d99
...@@ -44,6 +44,12 @@ ...@@ -44,6 +44,12 @@
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item>
<key> <string>portal_type</string> </key>
<value>
<dictionary/>
</value>
</item>
<item> <item>
<key> <string>strict_membership</string> </key> <key> <string>strict_membership</string> </key>
<value> <value>
...@@ -64,6 +70,7 @@ ...@@ -64,6 +70,7 @@
<value> <value>
<list> <list>
<string>category_list</string> <string>category_list</string>
<string>portal_type</string>
<string>strict_membership</string> <string>strict_membership</string>
<string>where_expression</string> <string>where_expression</string>
<string>order_by_expression</string> <string>order_by_expression</string>
...@@ -84,6 +91,7 @@ ...@@ -84,6 +91,7 @@
<item> <item>
<key> <string>arguments_src</string> </key> <key> <string>arguments_src</string> </key>
<value> <string>category_list\r\n <value> <string>category_list\r\n
portal_type\r\n
strict_membership\r\n strict_membership\r\n
where_expression\r\n where_expression\r\n
order_by_expression</string> </value> order_by_expression</string> </value>
...@@ -129,6 +137,13 @@ order_by_expression</string> </value> ...@@ -129,6 +137,13 @@ order_by_expression</string> </value>
SELECT DISTINCT catalog.uid, catalog.path, portal_type\n SELECT DISTINCT catalog.uid, catalog.path, portal_type\n
FROM catalog, category\n FROM catalog, category\n
WHERE catalog.uid = category.uid\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 AND (<dtml-var "portal_categories.buildSQLSelector(category_list)">)\n
<dtml-if strict_membership>\n <dtml-if strict_membership>\n
AND category.category_strict_membership = 1\n AND category.category_strict_membership = 1\n
...@@ -180,6 +195,13 @@ ORDER BY\n ...@@ -180,6 +195,13 @@ ORDER BY\n
SELECT DISTINCT catalog.uid, catalog.path, portal_type\n SELECT DISTINCT catalog.uid, catalog.path, portal_type\n
FROM catalog, category\n FROM catalog, category\n
WHERE catalog.uid = category.uid\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 AND (<dtml-var "portal_categories.buildSQLSelector(category_list)">)\n
<dtml-if strict_membership>\n <dtml-if strict_membership>\n
AND category.category_strict_membership = 1\n AND category.category_strict_membership = 1\n
......
268 271
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment