[Erp5-report] r16133 - in /erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog: Ca...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Sep 6 17:33:59 CEST 2007
Author: seb
Date: Thu Sep 6 17:33:59 2007
New Revision: 16133
URL: http://svn.erp5.org?rev=16133&view=rev
Log:
make z_getitem_by_path and z_getitem_by_uid support list of uid or path
Modified:
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_getitem_by_path.xml
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_getitem_by_uid.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_getitem_by_path.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_getitem_by_path.xml?rev=16133&r1=16132&r2=16133&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_getitem_by_path.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_getitem_by_path.xml Thu Sep 6 17:33:59 2007
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ZSQLMethods.SQL</string>
- <string>SQL</string>
- </tuple>
- <none/>
+ <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -39,6 +36,12 @@
</value>
</item>
<item>
+ <key> <string>path_list</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
<key> <string>uid_only</string> </key>
<value>
<dictionary/>
@@ -51,8 +54,9 @@
<key> <string>_keys</string> </key>
<value>
<list>
- <string>path</string>
- <string>uid_only</string>
+<string>path</string>
+<string>path_list</string>
+<string>uid_only</string>
</list>
</value>
</item>
@@ -69,7 +73,8 @@
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>path\n
+ <value> <string>path\r\n
+path_list\r\n
uid_only</string> </value>
</item>
<item>
@@ -86,9 +91,7 @@
</item>
<item>
<key> <string>connection_hook</string> </key>
- <value>
- <none/>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>connection_id</string> </key>
@@ -100,17 +103,27 @@
</item>
<item>
<key> <string>max_cache_</string> </key>
- <value> <int>100</int> </value>
+ <value> <int>0</int> </value>
</item>
<item>
<key> <string>max_rows_</string> </key>
- <value> <int>10</int> </value>
+ <value> <int>0</int> </value>
</item>
<item>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-select <dtml-if uid_only>uid<dtml-else>*</dtml-if> from catalog where <dtml-sqltest path op=eq type="string">
+SELECT <dtml-if uid_only>uid<dtml-else>uid,path</dtml-if> from catalog \n
+WHERE \n
+ 1 = 1\n
+<dtml-if path>\n
+ AND <dtml-sqltest path op=eq type="string">\n
+</dtml-if>\n
+<dtml-if path_list>\n
+ AND path IN (<dtml-in path_list><dtml-sqlvar sequence-item type="string">\n
+ <dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>)\n
+</dtml-if>\n
+
]]></string> </value>
</item>
@@ -119,9 +132,11 @@
<value>
<object>
<klass>
+ <global name="__newobj__" module="copy_reg"/>
+ </klass>
+ <tuple>
<global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </klass>
- <none/>
+ </tuple>
<state>
<dictionary>
<item>
@@ -148,7 +163,17 @@
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-select <dtml-if uid_only>uid<dtml-else>*</dtml-if> from catalog where <dtml-sqltest path op=eq type="string">
+SELECT <dtml-if uid_only>uid<dtml-else>uid,path</dtml-if> from catalog \n
+WHERE \n
+ 1 = 1\n
+<dtml-if path>\n
+ AND <dtml-sqltest path op=eq type="string">\n
+</dtml-if>\n
+<dtml-if path_list>\n
+ AND path IN (<dtml-in path_list><dtml-sqlvar sequence-item type="string">\n
+ <dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>)\n
+</dtml-if>\n
+
]]></string> </value>
</item>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_getitem_by_uid.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_getitem_by_uid.xml?rev=16133&r1=16132&r2=16133&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_getitem_by_uid.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_getitem_by_uid.xml Thu Sep 6 17:33:59 2007
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ZSQLMethods.SQL</string>
- <string>SQL</string>
- </tuple>
- <none/>
+ <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -33,7 +30,19 @@
<value>
<dictionary>
<item>
+ <key> <string>path_only</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
<key> <string>uid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>uid_list</string> </key>
<value>
<dictionary/>
</value>
@@ -45,7 +54,9 @@
<key> <string>_keys</string> </key>
<value>
<list>
- <string>uid</string>
+<string>uid</string>
+<string>uid_list</string>
+<string>path_only</string>
</list>
</value>
</item>
@@ -62,7 +73,9 @@
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>uid</string> </value>
+ <value> <string>uid\r\n
+uid_list\r\n
+path_only</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -78,9 +91,7 @@
</item>
<item>
<key> <string>connection_hook</string> </key>
- <value>
- <none/>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>connection_id</string> </key>
@@ -96,13 +107,23 @@
</item>
<item>
<key> <string>max_rows_</string> </key>
- <value> <int>1</int> </value>
+ <value> <int>0</int> </value>
</item>
<item>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-select * from catalog where <dtml-sqltest uid op=eq type="int">
+SELECT <dtml-if path_only>path<dtml-else>uid,path</dtml-if> from catalog \n
+WHERE \n
+ 1 = 1\n
+<dtml-if uid>\n
+ AND <dtml-sqltest uid op=eq type="int">\n
+</dtml-if>\n
+<dtml-if uid_list>\n
+ AND uid IN (<dtml-in uid_list><dtml-sqlvar sequence-item type="int">\n
+ <dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>)\n
+</dtml-if>\n
+
]]></string> </value>
</item>
@@ -111,9 +132,11 @@
<value>
<object>
<klass>
+ <global name="__newobj__" module="copy_reg"/>
+ </klass>
+ <tuple>
<global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </klass>
- <none/>
+ </tuple>
<state>
<dictionary>
<item>
@@ -140,7 +163,17 @@
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-select * from catalog where <dtml-sqltest uid op=eq type="int">
+SELECT <dtml-if path_only>path<dtml-else>uid,path</dtml-if> from catalog \n
+WHERE \n
+ 1 = 1\n
+<dtml-if uid>\n
+ AND <dtml-sqltest uid op=eq type="int">\n
+</dtml-if>\n
+<dtml-if uid_list>\n
+ AND uid IN (<dtml-in uid_list><dtml-sqlvar sequence-item type="int">\n
+ <dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>)\n
+</dtml-if>\n
+
]]></string> </value>
</item>
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=16133&r1=16132&r2=16133&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision Thu Sep 6 17:33:59 2007
@@ -1,2 +1,1 @@
-85
-
+54
More information about the Erp5-report
mailing list