[Erp5-report] r32756 vincent - in /erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_cat...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Feb 18 12:01:10 CET 2010
Author: vincent
Date: Thu Feb 18 12:01:03 2010
New Revision: 32756
URL: http://svn.erp5.org?rev=32756&view=rev
Log:
Add from_expression support in z_count_results.
Modified:
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml?rev=32756&r1=32755&r2=32756&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml [utf8] Thu Feb 18 12:01:03 2010
@@ -24,9 +24,20 @@
<value>
<dictionary>
<item>
+ <key> <string>from_expression</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
<key> <string>from_table_list</string> </key>
<value>
- <dictionary/>
+ <dictionary>
+ <item>
+ <key> <string>type</string> </key>
+ <value> <string>list</string> </value>
+ </item>
+ </dictionary>
</value>
</item>
<item>
@@ -57,6 +68,17 @@
<key> <string>selection_report</string> </key>
<value>
<dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>valid_from_table_list</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>type</string> </key>
+ <value> <string>list</string> </value>
+ </item>
+ </dictionary>
</value>
</item>
<item>
@@ -72,12 +94,14 @@
<key> <string>_keys</string> </key>
<value>
<list>
- <string>from_table_list</string>
+ <string>selection_domain</string>
+ <string>selection_report</string>
<string>where_expression</string>
<string>select_expression</string>
<string>group_by_expression</string>
- <string>selection_domain</string>
- <string>selection_report</string>
+ <string>from_table_list</string>
+ <string>valid_from_table_list</string>
+ <string>from_expression</string>
<string>limit_expression</string>
</list>
</value>
@@ -95,12 +119,14 @@
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>from_table_list\r\n
+ <value> <string>selection_domain\r\n
+selection_report\r\n
where_expression\r\n
select_expression\r\n
group_by_expression\r\n
-selection_domain\r\n
-selection_report\r\n
+from_table_list:list\r\n
+valid_from_table_list:list\r\n
+from_expression\r\n
limit_expression</string> </value>
</item>
<item>
@@ -145,7 +171,15 @@
, <dtml-var select_expression>\n
</dtml-if>\n
FROM\n
- <dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
+ <dtml-if from_expression>\n
+ <dtml-var from_expression>\n
+ <dtml-else>\n
+ <dtml-if valid_from_table_list>\n
+ <dtml-in valid_from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
+ <dtml-else>\n
+ <dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
+ </dtml-if>\n
+ </dtml-if>\n
<dtml-if selection_domain>\n
<dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain, category_table_alias = \'domain_category\')">\n
<dtml-if expression> , <dtml-var expression> </dtml-if>\n
@@ -228,7 +262,15 @@
, <dtml-var select_expression>\n
</dtml-if>\n
FROM\n
- <dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
+ <dtml-if from_expression>\n
+ <dtml-var from_expression>\n
+ <dtml-else>\n
+ <dtml-if valid_from_table_list>\n
+ <dtml-in valid_from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
+ <dtml-else>\n
+ <dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
+ </dtml-if>\n
+ </dtml-if>\n
<dtml-if selection_domain>\n
<dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain, category_table_alias = \'domain_category\')">\n
<dtml-if expression> , <dtml-var expression> </dtml-if>\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision?rev=32756&r1=32755&r2=32756&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision [utf8] Thu Feb 18 12:01:03 2010
@@ -1,1 +1,1 @@
-174
+176
More information about the Erp5-report
mailing list