[Erp5-report] r37920 tatuya - in /erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_cata...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Aug 20 09:24:21 CEST 2010
Author: tatuya
Date: Fri Aug 20 09:24:21 2010
New Revision: 37920
URL: http://svn.erp5.org?rev=37920&view=rev
Log:
2010-08-20 tatuya
* Add grand_parent_delivery_portal_type, and grand_grand_grand_parent_delivery_portal_type related keys so that we will select the delivery portal type of a simulation movement.
Added:
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_parent_delivery.catalog_keys.xml
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_parent_delivery.xml
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_parent_delivery.catalog_keys.xml
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_parent_delivery.xml
Modified:
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogRelatedKeyTemplateItem/related_key_list.xml
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/change_log
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_method_id_list
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_related_key_list
Added: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_parent_delivery.catalog_keys.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_parent_delivery.catalog_keys.xml?rev=37920&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_parent_delivery.catalog_keys.xml (added)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_parent_delivery.catalog_keys.xml [utf8] Fri Aug 20 09:24:21 2010
@@ -0,0 +1,2 @@
+<catalog_method>
+</catalog_method>
Added: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_parent_delivery.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_parent_delivery.xml?rev=37920&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_parent_delivery.xml (added)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_parent_delivery.xml [utf8] Fri Aug 20 09:24:21 2010
@@ -0,0 +1,194 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_arg</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_data</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>table_0</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>table_1</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>table_2</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>table_3</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>table_4</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>_keys</string> </key>
+ <value>
+ <list>
+ <string>table_0</string>
+ <string>table_1</string>
+ <string>table_2</string>
+ <string>table_3</string>
+ <string>table_4</string>
+ </list>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>allow_simple_one_argument_traversal</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>arguments_src</string> </key>
+ <value> <string>table_0\r\n
+table_1\r\n
+table_2\r\n
+table_3\r\n
+table_4\r\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>cache_time_</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>class_file_</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>class_name_</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>connection_hook</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>connection_id</string> </key>
+ <value> <string>erp5_sql_connection</string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>z_related_grand_grand_grand_parent_delivery</string> </value>
+ </item>
+ <item>
+ <key> <string>max_cache_</string> </key>
+ <value> <int>100</int> </value>
+ </item>
+ <item>
+ <key> <string>max_rows_</string> </key>
+ <value> <int>1000</int> </value>
+ </item>
+ <item>
+ <key> <string>src</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.delivery.getUid()">\n
+AND <dtml-var table_0>.uid = <dtml-var table_3>.parent_uid\n
+AND <dtml-var table_1>.uid = catalog.parent_uid\n
+AND <dtml-var table_2>.uid = <dtml-var table_1>.parent_uid\n
+AND <dtml-var table_3>.uid = <dtml-var table_2>.parent_uid\n
+AND <dtml-var table_4>.uid = <dtml-var table_0>.category_uid\n
+
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>template</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="__newobj__" module="copy_reg"/>
+ </klass>
+ <tuple>
+ <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+ </tuple>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>__name__</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<string>
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>_vars</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>globals</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>raw</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.delivery.getUid()">\n
+AND <dtml-var table_0>.uid = <dtml-var table_3>.parent_uid\n
+AND <dtml-var table_1>.uid = catalog.parent_uid\n
+AND <dtml-var table_2>.uid = <dtml-var table_1>.parent_uid\n
+AND <dtml-var table_3>.uid = <dtml-var table_2>.parent_uid\n
+AND <dtml-var table_4>.uid = <dtml-var table_0>.category_uid\n
+
+
+]]></string> </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_parent_delivery.catalog_keys.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_parent_delivery.catalog_keys.xml?rev=37920&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_parent_delivery.catalog_keys.xml (added)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_parent_delivery.catalog_keys.xml [utf8] Fri Aug 20 09:24:21 2010
@@ -0,0 +1,2 @@
+<catalog_method>
+</catalog_method>
Added: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_parent_delivery.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_parent_delivery.xml?rev=37920&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_parent_delivery.xml (added)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_parent_delivery.xml [utf8] Fri Aug 20 09:24:21 2010
@@ -0,0 +1,174 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_arg</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_data</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>table_0</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>table_1</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>table_2</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>_keys</string> </key>
+ <value>
+ <list>
+ <string>table_0</string>
+ <string>table_1</string>
+ <string>table_2</string>
+ </list>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>allow_simple_one_argument_traversal</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>arguments_src</string> </key>
+ <value> <string>table_0\r\n
+table_1\r\n
+table_2\r\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>cache_time_</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>class_file_</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>class_name_</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>connection_hook</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>connection_id</string> </key>
+ <value> <string>erp5_sql_connection</string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>z_related_grand_parent_delivery</string> </value>
+ </item>
+ <item>
+ <key> <string>max_cache_</string> </key>
+ <value> <int>100</int> </value>
+ </item>
+ <item>
+ <key> <string>max_rows_</string> </key>
+ <value> <int>1000</int> </value>
+ </item>
+ <item>
+ <key> <string>src</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.delivery.getUid()">\n
+AND <dtml-var table_0>.uid = <dtml-var table_1>.parent_uid\n
+AND <dtml-var table_1>.uid = catalog.parent_uid\n
+AND <dtml-var table_2>.uid = <dtml-var table_0>.category_uid\n
+
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>template</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="__newobj__" module="copy_reg"/>
+ </klass>
+ <tuple>
+ <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+ </tuple>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>__name__</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<string>
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>_vars</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>globals</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>raw</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.delivery.getUid()">\n
+AND <dtml-var table_0>.uid = <dtml-var table_1>.parent_uid\n
+AND <dtml-var table_1>.uid = catalog.parent_uid\n
+AND <dtml-var table_2>.uid = <dtml-var table_0>.category_uid\n
+
+
+]]></string> </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogRelatedKeyTemplateItem/related_key_list.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogRelatedKeyTemplateItem/related_key_list.xml?rev=37920&r1=37919&r2=37920&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogRelatedKeyTemplateItem/related_key_list.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogRelatedKeyTemplateItem/related_key_list.xml [utf8] Fri Aug 20 09:24:21 2010
@@ -7,6 +7,8 @@
<key>explanation_portal_type | movement,catalog/portal_type/z_related_explanation</key>
<key>explanation_simulation_state | movement,catalog/simulation_state/z_related_explanation</key>
<key>grand_grand_grand_grand_grand_parent_simulation_state | catalog,catalog,catalog,catalog,catalog,catalog/simulation_state/z_related_grand_grand_grand_grand_grand_parent</key>
+ <key>grand_grand_grand_parent_delivery_portal_type | category,catalog,catalog,catalog,catalog/portal_type/z_related_grand_grand_grand_parent_delivery</key>
+ <key>grand_parent_delivery_portal_type | category,catalog,catalog/portal_type/z_related_grand_parent_delivery</key>
<key>grand_parent_portal_type | catalog,catalog/portal_type/z_related_grand_parent</key>
<key>grand_parent_simulation_state | catalog,catalog/simulation_state/z_related_grand_parent</key>
<key>item_node_category_uid | category/category_uid/z_related_node_uid_from_item</key>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/change_log?rev=37920&r1=37919&r2=37920&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/change_log [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/change_log [utf8] Fri Aug 20 09:24:21 2010
@@ -1,3 +1,6 @@
+2010-08-20 tatuya
+* Add grand_parent_delivery_portal_type, and grand_grand_grand_parent_delivery_portal_type related keys so that we will select the delivery portal type of a simulation movement.
+
2010-06-08 Kazuhiko
* Add portal_type column in translation table and use it in several related keys to avoid unexpected verbose results of translated state search.
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=37920&r1=37919&r2=37920&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] Fri Aug 20 09:24:21 2010
@@ -1 +1 @@
-196
\ No newline at end of file
+197
\ No newline at end of file
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_method_id_list
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_method_id_list?rev=37920&r1=37919&r2=37920&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_method_id_list [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_method_id_list [utf8] Fri Aug 20 09:24:21 2010
@@ -90,7 +90,9 @@ erp5_mysql_innodb/z_related_career_skill
erp5_mysql_innodb/z_related_explanation
erp5_mysql_innodb/z_related_function_uid_from_stock
erp5_mysql_innodb/z_related_grand_grand_grand_grand_grand_parent
+erp5_mysql_innodb/z_related_grand_grand_grand_parent_delivery
erp5_mysql_innodb/z_related_grand_parent
+erp5_mysql_innodb/z_related_grand_parent_delivery
erp5_mysql_innodb/z_related_metric_type
erp5_mysql_innodb/z_related_mirror_section_uid_from_stock
erp5_mysql_innodb/z_related_node_uid_from_stock
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_related_key_list
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_related_key_list?rev=37920&r1=37919&r2=37920&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_related_key_list [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_related_key_list [utf8] Fri Aug 20 09:24:21 2010
@@ -54,4 +54,6 @@ grand_grand_grand_grand_grand_parent_sim
parent_specialise_reference | category,catalog/reference/z_related_parent_specialise
predicate_category_base_category_uid | predicate_category/base_category_uid/z_related_predicate_category
predicate_category_category_strict_membership | predicate_category/category_strict_membership/z_related_predicate_category
-predicate_category_category_uid | predicate_category/category_uid/z_related_predicate_category
\ No newline at end of file
+predicate_category_category_uid | predicate_category/category_uid/z_related_predicate_category
+grand_parent_delivery_portal_type | category,catalog,catalog/portal_type/z_related_grand_parent_delivery
+grand_grand_grand_parent_delivery_portal_type | category,catalog,catalog,catalog,catalog/portal_type/z_related_grand_grand_grand_parent_delivery
\ No newline at end of file
More information about the Erp5-report
mailing list