diff --git a/bt5/erp5_catalog.bt5 b/bt5/erp5_catalog.bt5
index f8ff9720e396960ff574e0be85509c499bec8bbe..a232a7945068398ab6b826cc69ccbb29a0e01aa2 100755
--- a/bt5/erp5_catalog.bt5
+++ b/bt5/erp5_catalog.bt5
@@ -181,9 +181,11 @@
</item>
<item>
<key> <string>change_log</string> </key>
- <value>
- <none/>
- </value>
+ <value> <string>2005-04-19 Yoshinor Okuji\n
+\n
+* Update z_update_delivery.\n
+\n
+* Add predicate, predicate_category and delivery.</string> </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -213,79 +215,79 @@
<key> <string>template_catalog_method_id</string> </key>
<value>
<tuple>
- <string>erp5_mysql/z_produce_reserved_uid_list</string>
+ <string>erp5_mysql/z_related_node_uid_from_stock</string>
<string>erp5_mysql/z_create_catalog</string>
<string>erp5_mysql/z0_drop_catalog</string>
<string>erp5_mysql/AppliedRule_insertMovement</string>
<string>erp5_mysql/AppliedRule_deleteCatalog</string>
- <string>erp5_mysql/z_show_columns</string>
- <string>erp5_mysql/z_create_stock</string>
- <string>erp5_mysql/z_related_resource_uid_from_stock</string>
+ <string>erp5_mysql/z_catalog_item</string>
+ <string>erp5_mysql/z_search_folder</string>
<string>erp5_mysql/AppliedRule_createMessageTable</string>
<string>erp5_mysql/z0_uncatalog_movement</string>
- <string>erp5_mysql/z_unique_values</string>
<string>erp5_mysql/z0_drop_movement</string>
<string>erp5_mysql/z_catalog_roles_and_users</string>
<string>erp5_mysql/AppliedRule_deleteCategory</string>
- <string>erp5_mysql/z_record_uncatalog_object</string>
+ <string>erp5_mysql/z_create_predicate</string>
<string>erp5_mysql/z_search_results</string>
<string>erp5_mysql/z0_drop_delivery</string>
<string>erp5_mysql/z_related_mirror_section_uid_from_stock</string>
<string>erp5_mysql/z_related_security</string>
<string>erp5_mysql/z_create_category</string>
- <string>erp5_mysql/z_getitem_by_uid</string>
- <string>erp5_mysql/z_uncatalog_delivery</string>
+ <string>erp5_mysql/z0_drop_item</string>
+ <string>erp5_mysql/z0_drop_predicate</string>
<string>erp5_mysql/z0_uncatalog_compatibility</string>
<string>erp5_mysql/z_uncatalog_object</string>
<string>erp5_mysql/z_catalog_stock</string>
<string>erp5_mysql/z0_uncatalog_stock</string>
- <string>erp5_mysql/z_getitem_by_path</string>
<string>erp5_mysql/z0_drop_roles_and_users</string>
- <string>erp5_mysql/z_related_node_uid_from_stock</string>
+ <string>erp5_mysql/z_related_predicate</string>
<string>erp5_mysql/z_create_roles_and_users</string>
<string>erp5_mysql/z_related_section_uid_from_stock</string>
- <string>erp5_mysql/z_catalog_paths</string>
+ <string>erp5_mysql/z_catalog_item_list</string>
<string>erp5_mysql/AppliedRule_deleteMovement</string>
<string>erp5_mysql/AppliedRule_insertCatalog</string>
- <string>erp5_mysql/z_create_record</string>
- <string>erp5_mysql/z_clear_reserved</string>
+ <string>erp5_mysql/z0_drop_predicate_category</string>
<string>erp5_mysql/AppliedRule_insertStock</string>
<string>erp5_mysql/z_create_delivery</string>
<string>erp5_mysql/z_catalog_roles_and_users_list</string>
<string>erp5_mysql/z_related_payment_uid_from_stock</string>
<string>erp5_mysql/z_count_results</string>
<string>erp5_mysql/AppliedRule_insertCategory</string>
- <string>erp5_mysql/z_show_tables</string>
- <string>erp5_mysql/z_delete_recorded_object_list</string>
<string>erp5_mysql/z0_uncatalog_category</string>
<string>erp5_mysql/z_update_delivery</string>
<string>erp5_mysql/AppliedRule_deleteStock</string>
<string>erp5_mysql/z0_drop_subject</string>
<string>erp5_mysql/z_create_compatibility</string>
<string>erp5_mysql/z_catalog_category</string>
- <string>erp5_mysql/z_read_recorded_object_list</string>
- <string>erp5_mysql/z0_drop_compatibility</string>
+ <string>erp5_mysql/z_show_category_columns</string>
+ <string>erp5_mysql/z0_uncatalog_predicate_category</string>
+ <string>erp5_mysql/z0_uncatalog_roles_and_users</string>
<string>erp5_mysql/z_catalog_compatibility</string>
- <string>erp5_mysql/z0_drop_record</string>
+ <string>erp5_mysql/z_catalog_predicate_category</string>
<string>erp5_mysql/z0_drop_stock</string>
<string>erp5_mysql/z0_drop_category</string>
<string>erp5_mysql/z_catalog_movement</string>
<string>erp5_mysql/z_update_object</string>
- <string>erp5_mysql/z_show_category_columns</string>
+ <string>erp5_mysql/z_create_item</string>
<string>erp5_mysql/z_catalog_category_list</string>
+ <string>erp5_mysql/z_uncatalog_delivery</string>
+ <string>erp5_mysql/z_create_stock</string>
+ <string>erp5_mysql/z_catalog_predicate</string>
<string>erp5_mysql/z_catalog_object_list</string>
<string>erp5_mysql/z_catalog_compatibility_list</string>
- <string>erp5_mysql/z_record_catalog_object</string>
+ <string>erp5_mysql/z_related_resource_uid_from_stock</string>
<string>erp5_mysql/z_catalog_subject_list</string>
<string>erp5_mysql/z_related_resource</string>
<string>erp5_mysql/z_create_movement</string>
<string>erp5_mysql/z0_uncatalog_subject</string>
+ <string>erp5_mysql/z_related_uid</string>
<string>erp5_mysql/z_catalog_stock_list</string>
- <string>erp5_mysql/z_search_folder</string>
<string>erp5_mysql/z_create_subject</string>
- <string>erp5_mysql/z0_uncatalog_roles_and_users</string>
- <string>erp5_mysql/z_related_uid</string>
+ <string>erp5_mysql/z0_uncatalog_predicate</string>
+ <string>erp5_mysql/z0_drop_compatibility</string>
+ <string>erp5_mysql/z0_uncatalog_item</string>
<string>erp5_mysql/z_catalog_movement_list</string>
+ <string>erp5_mysql/z_create_predicate_category</string>
<string>erp5_mysql/z_catalog_subject</string>
</tuple>
</value>
@@ -295,6 +297,7 @@
<value>
<tuple>
<string>allowedRolesAndUsers | roles_and_users/allowedRolesAndUsers/z_related_security</string>
+ <string>predicate_uid | predicate/uid/z_related_predicate</string>
<string>stock_paymentCategory | category/category_uid/z_related_payment_uid_from_stock</string>
<string>stock_mirrorSectionCategory | category/category_uid/z_related_mirror_section_uid_from_stock</string>
<string>stock_sectionCategory | category/category_uid/z_related_section_uid_from_stock</string>
@@ -320,10 +323,13 @@
<tuple>
<string>catalog</string>
<string>category</string>
- <string>compatibility</string>
- <string>movement</string>
+ <string>predicate</string>
<string>roles_and_users</string>
+ <string>delivery</string>
+ <string>predicate_category</string>
<string>stock</string>
+ <string>compatibility</string>
+ <string>movement</string>
</tuple>
</value>
</item>
@@ -744,6 +750,12 @@
<persistent> <string encoding="base64">AAAAAAAAAC0=</string> </persistent>
</value>
</item>
+ <item>
+ <key> <string>_path_archive</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAC4=</string> </persistent>
+ </value>
+ </item>
<item>
<key> <string>tool_id</string> </key>
<value>
@@ -768,13 +780,13 @@
<item>
<key> <string>_archive</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAC4=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAC8=</string> </persistent>
</value>
</item>
<item>
<key> <string>_workflow_chain_archive</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAC8=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAADA=</string> </persistent>
</value>
</item>
<item>
@@ -799,7 +811,7 @@
<item>
<key> <string>_archive</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAADA=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAADE=</string> </persistent>
</value>
</item>
</dictionary>
@@ -820,7 +832,7 @@
<item>
<key> <string>_archive</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAADE=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAADI=</string> </persistent>
</value>
</item>
</dictionary>
@@ -841,7 +853,7 @@
<item>
<key> <string>_archive</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAADI=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAADM=</string> </persistent>
</value>
</item>
</dictionary>
@@ -862,7 +874,7 @@
<item>
<key> <string>_archive</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAADM=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAADQ=</string> </persistent>
</value>
</item>
</dictionary>
@@ -883,7 +895,7 @@
<item>
<key> <string>_archive</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAADQ=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAADU=</string> </persistent>
</value>
</item>
<item>
@@ -908,7 +920,7 @@
<item>
<key> <string>_archive</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAADU=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAADY=</string> </persistent>
</value>
</item>
</dictionary>
@@ -943,7 +955,7 @@
<item>
<key> <string>_archive</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAADY=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAADc=</string> </persistent>
</value>
</item>
<item>
@@ -2732,502 +2744,1672 @@
</value>
</item>
</dictionary>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>business_template_installation_workflow</string> </key>
- <value>
- <none/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="25" aka="AAAAAAAAABk=">
- <pickle>
- <tuple>
- <tuple>
- <string>Persistence</string>
- <string>PersistentMapping</string>
- </tuple>
- <none/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_container</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="26" aka="AAAAAAAAABo=">
- <pickle>
- <tuple>
- <tuple>
- <string>Persistence</string>
- <string>PersistentMapping</string>
- </tuple>
- <none/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_container</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>portal_catalog/erp5_mysql/AppliedRule_createMessageTable</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAADc=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/AppliedRule_deleteCatalog</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAADg=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/AppliedRule_deleteCategory</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAADk=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/AppliedRule_deleteMovement</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAADo=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/AppliedRule_deleteStock</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAADs=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/AppliedRule_insertCatalog</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAADw=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/AppliedRule_insertCategory</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAD0=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/AppliedRule_insertMovement</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAD4=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/AppliedRule_insertStock</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAD8=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/z0_drop_catalog</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAEA=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/z0_drop_category</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAEE=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/z0_drop_compatibility</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAEI=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/z0_drop_delivery</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAEM=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/z0_drop_movement</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAEQ=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/z0_drop_record</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAEU=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/z0_drop_roles_and_users</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAEY=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/z0_drop_stock</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAEc=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/z0_drop_subject</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAEg=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/z0_uncatalog_category</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAEk=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/z0_uncatalog_compatibility</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAEo=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/z0_uncatalog_movement</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAEs=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/z0_uncatalog_roles_and_users</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAEw=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/z0_uncatalog_stock</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAE0=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/z0_uncatalog_subject</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAE4=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/z_catalog_category</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAE8=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/z_catalog_category_list</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAFA=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>portal_catalog/erp5_mysql/z_catalog_compatibility</string> </key>
+ <dictionary>
+ <item>
+ <key> <string>building_action</string> </key>
+ <value> <string>edit</string> </value>
+ </item>
+ <item>
+ <key> <string>building_actor</string> </key>
+ <value> <string>yo</string> </value>
+ </item>
+ <item>
+ <key> <string>building_comment</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>building_state</string> </key>
+ <value> <string>modified</string> </value>
+ </item>
+ <item>
+ <key> <string>building_time</string> </key>
+ <value>
+ <object>
+ <klass> <reference id="24.1"/> </klass>
+ <tuple>
+ <none/>
+ </tuple>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_aday</string> </key>
+ <value> <string>Tue</string> </value>
+ </item>
+ <item>
+ <key> <string>_amon</string> </key>
+ <value> <string>Apr</string> </value>
+ </item>
+ <item>
+ <key> <string>_d</string> </key>
+ <value> <float>38094.644882</float> </value>
+ </item>
+ <item>
+ <key> <string>_day</string> </key>
+ <value> <int>19</int> </value>
+ </item>
+ <item>
+ <key> <string>_dayoffset</string> </key>
+ <value> <int>2</int> </value>
+ </item>
+ <item>
+ <key> <string>_fday</string> </key>
+ <value> <string>Tuesday</string> </value>
+ </item>
+ <item>
+ <key> <string>_fmon</string> </key>
+ <value> <string>April</string> </value>
+ </item>
+ <item>
+ <key> <string>_hour</string> </key>
+ <value> <int>17</int> </value>
+ </item>
+ <item>
+ <key> <string>_millis</string> </key>
+ <value> <long>1113924517808</long> </value>
+ </item>
+ <item>
+ <key> <string>_minute</string> </key>
+ <value> <int>28</int> </value>
+ </item>
+ <item>
+ <key> <string>_month</string> </key>
+ <value> <int>4</int> </value>
+ </item>
+ <item>
+ <key> <string>_nearsec</string> </key>
+ <value> <float>37.0</float> </value>
+ </item>
+ <item>
+ <key> <string>_pday</string> </key>
+ <value> <string>Tue.</string> </value>
+ </item>
+ <item>
+ <key> <string>_pm</string> </key>
+ <value> <string>pm</string> </value>
+ </item>
+ <item>
+ <key> <string>_pmhour</string> </key>
+ <value> <int>5</int> </value>
+ </item>
+ <item>
+ <key> <string>_pmon</string> </key>
+ <value> <string>Apr.</string> </value>
+ </item>
+ <item>
+ <key> <string>_second</string> </key>
+ <value> <float>37.808</float> </value>
+ </item>
+ <item>
+ <key> <string>_t</string> </key>
+ <value> <float>1113924517.81</float> </value>
+ </item>
+ <item>
+ <key> <string>_tz</string> </key>
+ <value> <string>GMT+2</string> </value>
+ </item>
+ <item>
+ <key> <string>_year</string> </key>
+ <value> <int>2005</int> </value>
+ </item>
+ <item>
+ <key> <string>time</string> </key>
+ <value> <float>0.644882037035</float> </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ </dictionary>
+ <dictionary>
+ <item>
+ <key> <string>building_action</string> </key>
+ <value> <string>build_action</string> </value>
+ </item>
+ <item>
+ <key> <string>building_actor</string> </key>
+ <value> <string>yo</string> </value>
+ </item>
+ <item>
+ <key> <string>building_comment</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>building_state</string> </key>
+ <value> <string>modified</string> </value>
+ </item>
+ <item>
+ <key> <string>building_time</string> </key>
+ <value>
+ <object>
+ <klass> <reference id="24.1"/> </klass>
+ <tuple>
+ <none/>
+ </tuple>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_aday</string> </key>
+ <value> <string>Tue</string> </value>
+ </item>
+ <item>
+ <key> <string>_amon</string> </key>
+ <value> <string>Apr</string> </value>
+ </item>
+ <item>
+ <key> <string>_d</string> </key>
+ <value> <float>38094.6449597</float> </value>
+ </item>
+ <item>
+ <key> <string>_day</string> </key>
+ <value> <int>19</int> </value>
+ </item>
+ <item>
+ <key> <string>_dayoffset</string> </key>
+ <value> <int>2</int> </value>
+ </item>
+ <item>
+ <key> <string>_fday</string> </key>
+ <value> <string>Tuesday</string> </value>
+ </item>
+ <item>
+ <key> <string>_fmon</string> </key>
+ <value> <string>April</string> </value>
+ </item>
+ <item>
+ <key> <string>_hour</string> </key>
+ <value> <int>17</int> </value>
+ </item>
+ <item>
+ <key> <string>_millis</string> </key>
+ <value> <long>1113924524514</long> </value>
+ </item>
+ <item>
+ <key> <string>_minute</string> </key>
+ <value> <int>28</int> </value>
+ </item>
+ <item>
+ <key> <string>_month</string> </key>
+ <value> <int>4</int> </value>
+ </item>
+ <item>
+ <key> <string>_nearsec</string> </key>
+ <value> <float>44.0</float> </value>
+ </item>
+ <item>
+ <key> <string>_pday</string> </key>
+ <value> <string>Tue.</string> </value>
+ </item>
+ <item>
+ <key> <string>_pm</string> </key>
+ <value> <string>pm</string> </value>
+ </item>
+ <item>
+ <key> <string>_pmhour</string> </key>
+ <value> <int>5</int> </value>
+ </item>
+ <item>
+ <key> <string>_pmon</string> </key>
+ <value> <string>Apr.</string> </value>
+ </item>
+ <item>
+ <key> <string>_second</string> </key>
+ <value> <float>44.514</float> </value>
+ </item>
+ <item>
+ <key> <string>_t</string> </key>
+ <value> <float>1113924524.51</float> </value>
+ </item>
+ <item>
+ <key> <string>_tz</string> </key>
+ <value> <string>GMT+2</string> </value>
+ </item>
+ <item>
+ <key> <string>_year</string> </key>
+ <value> <int>2005</int> </value>
+ </item>
+ <item>
+ <key> <string>time</string> </key>
+ <value> <float>0.644959652775</float> </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ </dictionary>
+ <dictionary>
+ <item>
+ <key> <string>building_action</string> </key>
+ <value> <string>build</string> </value>
+ </item>
+ <item>
+ <key> <string>building_actor</string> </key>
+ <value> <string>yo</string> </value>
+ </item>
+ <item>
+ <key> <string>building_comment</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>building_state</string> </key>
+ <value> <string>built</string> </value>
+ </item>
+ <item>
+ <key> <string>building_time</string> </key>
+ <value>
+ <object>
+ <klass> <reference id="24.1"/> </klass>
+ <tuple>
+ <none/>
+ </tuple>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_aday</string> </key>
+ <value> <string>Tue</string> </value>
+ </item>
+ <item>
+ <key> <string>_amon</string> </key>
+ <value> <string>Apr</string> </value>
+ </item>
+ <item>
+ <key> <string>_d</string> </key>
+ <value> <float>38094.6449641</float> </value>
+ </item>
+ <item>
+ <key> <string>_day</string> </key>
+ <value> <int>19</int> </value>
+ </item>
+ <item>
+ <key> <string>_dayoffset</string> </key>
+ <value> <int>2</int> </value>
+ </item>
+ <item>
+ <key> <string>_fday</string> </key>
+ <value> <string>Tuesday</string> </value>
+ </item>
+ <item>
+ <key> <string>_fmon</string> </key>
+ <value> <string>April</string> </value>
+ </item>
+ <item>
+ <key> <string>_hour</string> </key>
+ <value> <int>17</int> </value>
+ </item>
+ <item>
+ <key> <string>_millis</string> </key>
+ <value> <long>1113924524896</long> </value>
+ </item>
+ <item>
+ <key> <string>_minute</string> </key>
+ <value> <int>28</int> </value>
+ </item>
+ <item>
+ <key> <string>_month</string> </key>
+ <value> <int>4</int> </value>
+ </item>
+ <item>
+ <key> <string>_nearsec</string> </key>
+ <value> <float>44.0</float> </value>
+ </item>
+ <item>
+ <key> <string>_pday</string> </key>
+ <value> <string>Tue.</string> </value>
+ </item>
+ <item>
+ <key> <string>_pm</string> </key>
+ <value> <string>pm</string> </value>
+ </item>
+ <item>
+ <key> <string>_pmhour</string> </key>
+ <value> <int>5</int> </value>
+ </item>
+ <item>
+ <key> <string>_pmon</string> </key>
+ <value> <string>Apr.</string> </value>
+ </item>
+ <item>
+ <key> <string>_second</string> </key>
+ <value> <float>44.896</float> </value>
+ </item>
+ <item>
+ <key> <string>_t</string> </key>
+ <value> <float>1113924524.9</float> </value>
+ </item>
+ <item>
+ <key> <string>_tz</string> </key>
+ <value> <string>GMT+2</string> </value>
+ </item>
+ <item>
+ <key> <string>_year</string> </key>
+ <value> <int>2005</int> </value>
+ </item>
+ <item>
+ <key> <string>time</string> </key>
+ <value> <float>0.644964074076</float> </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ </dictionary>
+ <dictionary>
+ <item>
+ <key> <string>building_action</string> </key>
+ <value> <string>build</string> </value>
+ </item>
+ <item>
+ <key> <string>building_actor</string> </key>
+ <value> <string>yo</string> </value>
+ </item>
+ <item>
+ <key> <string>building_comment</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>building_state</string> </key>
+ <value> <string>built</string> </value>
+ </item>
+ <item>
+ <key> <string>building_time</string> </key>
+ <value>
+ <object>
+ <klass> <reference id="24.1"/> </klass>
+ <tuple>
+ <none/>
+ </tuple>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_aday</string> </key>
+ <value> <string>Tue</string> </value>
+ </item>
+ <item>
+ <key> <string>_amon</string> </key>
+ <value> <string>Apr</string> </value>
+ </item>
+ <item>
+ <key> <string>_d</string> </key>
+ <value> <float>38094.6449641</float> </value>
+ </item>
+ <item>
+ <key> <string>_day</string> </key>
+ <value> <int>19</int> </value>
+ </item>
+ <item>
+ <key> <string>_dayoffset</string> </key>
+ <value> <int>2</int> </value>
+ </item>
+ <item>
+ <key> <string>_fday</string> </key>
+ <value> <string>Tuesday</string> </value>
+ </item>
+ <item>
+ <key> <string>_fmon</string> </key>
+ <value> <string>April</string> </value>
+ </item>
+ <item>
+ <key> <string>_hour</string> </key>
+ <value> <int>17</int> </value>
+ </item>
+ <item>
+ <key> <string>_millis</string> </key>
+ <value> <long>1113924524901</long> </value>
+ </item>
+ <item>
+ <key> <string>_minute</string> </key>
+ <value> <int>28</int> </value>
+ </item>
+ <item>
+ <key> <string>_month</string> </key>
+ <value> <int>4</int> </value>
+ </item>
+ <item>
+ <key> <string>_nearsec</string> </key>
+ <value> <float>44.0</float> </value>
+ </item>
+ <item>
+ <key> <string>_pday</string> </key>
+ <value> <string>Tue.</string> </value>
+ </item>
+ <item>
+ <key> <string>_pm</string> </key>
+ <value> <string>pm</string> </value>
+ </item>
+ <item>
+ <key> <string>_pmhour</string> </key>
+ <value> <int>5</int> </value>
+ </item>
+ <item>
+ <key> <string>_pmon</string> </key>
+ <value> <string>Apr.</string> </value>
+ </item>
+ <item>
+ <key> <string>_second</string> </key>
+ <value> <float>44.901</float> </value>
+ </item>
+ <item>
+ <key> <string>_t</string> </key>
+ <value> <float>1113924524.9</float> </value>
+ </item>
+ <item>
+ <key> <string>_tz</string> </key>
+ <value> <string>GMT+2</string> </value>
+ </item>
+ <item>
+ <key> <string>_year</string> </key>
+ <value> <int>2005</int> </value>
+ </item>
+ <item>
+ <key> <string>time</string> </key>
+ <value> <float>0.644964131941</float> </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ </dictionary>
+ <dictionary>
+ <item>
+ <key> <string>building_action</string> </key>
+ <value> <string>edit</string> </value>
+ </item>
+ <item>
+ <key> <string>building_actor</string> </key>
+ <value> <string>yo</string> </value>
+ </item>
+ <item>
+ <key> <string>building_comment</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>building_state</string> </key>
+ <value> <string>modified</string> </value>
+ </item>
+ <item>
+ <key> <string>building_time</string> </key>
+ <value>
+ <object>
+ <klass> <reference id="24.1"/> </klass>
+ <tuple>
+ <none/>
+ </tuple>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_aday</string> </key>
+ <value> <string>Tue</string> </value>
+ </item>
+ <item>
+ <key> <string>_amon</string> </key>
+ <value> <string>Apr</string> </value>
+ </item>
+ <item>
+ <key> <string>_d</string> </key>
+ <value> <float>38094.7118363</float> </value>
+ </item>
+ <item>
+ <key> <string>_day</string> </key>
+ <value> <int>19</int> </value>
+ </item>
+ <item>
+ <key> <string>_dayoffset</string> </key>
+ <value> <int>2</int> </value>
+ </item>
+ <item>
+ <key> <string>_fday</string> </key>
+ <value> <string>Tuesday</string> </value>
+ </item>
+ <item>
+ <key> <string>_fmon</string> </key>
+ <value> <string>April</string> </value>
+ </item>
+ <item>
+ <key> <string>_hour</string> </key>
+ <value> <int>19</int> </value>
+ </item>
+ <item>
+ <key> <string>_millis</string> </key>
+ <value> <long>1113930302660</long> </value>
+ </item>
+ <item>
+ <key> <string>_minute</string> </key>
+ <value> <int>5</int> </value>
+ </item>
+ <item>
+ <key> <string>_month</string> </key>
+ <value> <int>4</int> </value>
+ </item>
+ <item>
+ <key> <string>_nearsec</string> </key>
+ <value> <float>2.0</float> </value>
+ </item>
+ <item>
+ <key> <string>_pday</string> </key>
+ <value> <string>Tue.</string> </value>
+ </item>
+ <item>
+ <key> <string>_pm</string> </key>
+ <value> <string>pm</string> </value>
+ </item>
+ <item>
+ <key> <string>_pmhour</string> </key>
+ <value> <int>7</int> </value>
+ </item>
+ <item>
+ <key> <string>_pmon</string> </key>
+ <value> <string>Apr.</string> </value>
+ </item>
+ <item>
+ <key> <string>_second</string> </key>
+ <value> <float>2.66</float> </value>
+ </item>
+ <item>
+ <key> <string>_t</string> </key>
+ <value> <float>1113930302.66</float> </value>
+ </item>
+ <item>
+ <key> <string>_tz</string> </key>
+ <value> <string>GMT+2</string> </value>
+ </item>
+ <item>
+ <key> <string>_year</string> </key>
+ <value> <int>2005</int> </value>
+ </item>
+ <item>
+ <key> <string>time</string> </key>
+ <value> <float>0.711836342591</float> </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ </dictionary>
+ <dictionary>
+ <item>
+ <key> <string>building_action</string> </key>
+ <value> <string>edit</string> </value>
+ </item>
+ <item>
+ <key> <string>building_actor</string> </key>
+ <value> <string>yo</string> </value>
+ </item>
+ <item>
+ <key> <string>building_comment</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>building_state</string> </key>
+ <value> <string>modified</string> </value>
+ </item>
+ <item>
+ <key> <string>building_time</string> </key>
+ <value>
+ <object>
+ <klass> <reference id="24.1"/> </klass>
+ <tuple>
+ <none/>
+ </tuple>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_aday</string> </key>
+ <value> <string>Tue</string> </value>
+ </item>
+ <item>
+ <key> <string>_amon</string> </key>
+ <value> <string>Apr</string> </value>
+ </item>
+ <item>
+ <key> <string>_d</string> </key>
+ <value> <float>38094.7129028</float> </value>
+ </item>
+ <item>
+ <key> <string>_day</string> </key>
+ <value> <int>19</int> </value>
+ </item>
+ <item>
+ <key> <string>_dayoffset</string> </key>
+ <value> <int>2</int> </value>
+ </item>
+ <item>
+ <key> <string>_fday</string> </key>
+ <value> <string>Tuesday</string> </value>
+ </item>
+ <item>
+ <key> <string>_fmon</string> </key>
+ <value> <string>April</string> </value>
+ </item>
+ <item>
+ <key> <string>_hour</string> </key>
+ <value> <int>19</int> </value>
+ </item>
+ <item>
+ <key> <string>_millis</string> </key>
+ <value> <long>1113930394799</long> </value>
+ </item>
+ <item>
+ <key> <string>_minute</string> </key>
+ <value> <int>6</int> </value>
+ </item>
+ <item>
+ <key> <string>_month</string> </key>
+ <value> <int>4</int> </value>
+ </item>
+ <item>
+ <key> <string>_nearsec</string> </key>
+ <value> <float>34.0</float> </value>
+ </item>
+ <item>
+ <key> <string>_pday</string> </key>
+ <value> <string>Tue.</string> </value>
+ </item>
+ <item>
+ <key> <string>_pm</string> </key>
+ <value> <string>pm</string> </value>
+ </item>
+ <item>
+ <key> <string>_pmhour</string> </key>
+ <value> <int>7</int> </value>
+ </item>
+ <item>
+ <key> <string>_pmon</string> </key>
+ <value> <string>Apr.</string> </value>
+ </item>
+ <item>
+ <key> <string>_second</string> </key>
+ <value> <float>34.799</float> </value>
+ </item>
+ <item>
+ <key> <string>_t</string> </key>
+ <value> <float>1113930394.8</float> </value>
+ </item>
+ <item>
+ <key> <string>_tz</string> </key>
+ <value> <string>GMT+2</string> </value>
+ </item>
+ <item>
+ <key> <string>_year</string> </key>
+ <value> <int>2005</int> </value>
+ </item>
+ <item>
+ <key> <string>time</string> </key>
+ <value> <float>0.712902766201</float> </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ </dictionary>
+ <dictionary>
+ <item>
+ <key> <string>building_action</string> </key>
+ <value> <string>edit</string> </value>
+ </item>
+ <item>
+ <key> <string>building_actor</string> </key>
+ <value> <string>yo</string> </value>
+ </item>
+ <item>
+ <key> <string>building_comment</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>building_state</string> </key>
+ <value> <string>modified</string> </value>
+ </item>
+ <item>
+ <key> <string>building_time</string> </key>
+ <value>
+ <object>
+ <klass> <reference id="24.1"/> </klass>
+ <tuple>
+ <none/>
+ </tuple>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_aday</string> </key>
+ <value> <string>Tue</string> </value>
+ </item>
+ <item>
+ <key> <string>_amon</string> </key>
+ <value> <string>Apr</string> </value>
+ </item>
+ <item>
+ <key> <string>_d</string> </key>
+ <value> <float>38094.7134732</float> </value>
+ </item>
+ <item>
+ <key> <string>_day</string> </key>
+ <value> <int>19</int> </value>
+ </item>
+ <item>
+ <key> <string>_dayoffset</string> </key>
+ <value> <int>2</int> </value>
+ </item>
+ <item>
+ <key> <string>_fday</string> </key>
+ <value> <string>Tuesday</string> </value>
+ </item>
+ <item>
+ <key> <string>_fmon</string> </key>
+ <value> <string>April</string> </value>
+ </item>
+ <item>
+ <key> <string>_hour</string> </key>
+ <value> <int>19</int> </value>
+ </item>
+ <item>
+ <key> <string>_millis</string> </key>
+ <value> <long>1113930444081</long> </value>
+ </item>
+ <item>
+ <key> <string>_minute</string> </key>
+ <value> <int>7</int> </value>
+ </item>
+ <item>
+ <key> <string>_month</string> </key>
+ <value> <int>4</int> </value>
+ </item>
+ <item>
+ <key> <string>_nearsec</string> </key>
+ <value> <float>24.0</float> </value>
+ </item>
+ <item>
+ <key> <string>_pday</string> </key>
+ <value> <string>Tue.</string> </value>
+ </item>
+ <item>
+ <key> <string>_pm</string> </key>
+ <value> <string>pm</string> </value>
+ </item>
+ <item>
+ <key> <string>_pmhour</string> </key>
+ <value> <int>7</int> </value>
+ </item>
+ <item>
+ <key> <string>_pmon</string> </key>
+ <value> <string>Apr.</string> </value>
+ </item>
+ <item>
+ <key> <string>_second</string> </key>
+ <value> <float>24.081</float> </value>
+ </item>
+ <item>
+ <key> <string>_t</string> </key>
+ <value> <float>1113930444.08</float> </value>
+ </item>
+ <item>
+ <key> <string>_tz</string> </key>
+ <value> <string>GMT+2</string> </value>
+ </item>
+ <item>
+ <key> <string>_year</string> </key>
+ <value> <int>2005</int> </value>
+ </item>
+ <item>
+ <key> <string>time</string> </key>
+ <value> <float>0.713473159725</float> </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ </dictionary>
+ <dictionary>
+ <item>
+ <key> <string>building_action</string> </key>
+ <value> <string>build_action</string> </value>
+ </item>
+ <item>
+ <key> <string>building_actor</string> </key>
+ <value> <string>yo</string> </value>
+ </item>
+ <item>
+ <key> <string>building_comment</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>building_state</string> </key>
+ <value> <string>modified</string> </value>
+ </item>
+ <item>
+ <key> <string>building_time</string> </key>
+ <value>
+ <object>
+ <klass> <reference id="24.1"/> </klass>
+ <tuple>
+ <none/>
+ </tuple>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_aday</string> </key>
+ <value> <string>Tue</string> </value>
+ </item>
+ <item>
+ <key> <string>_amon</string> </key>
+ <value> <string>Apr</string> </value>
+ </item>
+ <item>
+ <key> <string>_d</string> </key>
+ <value> <float>38094.7135792</float> </value>
+ </item>
+ <item>
+ <key> <string>_day</string> </key>
+ <value> <int>19</int> </value>
+ </item>
+ <item>
+ <key> <string>_dayoffset</string> </key>
+ <value> <int>2</int> </value>
+ </item>
+ <item>
+ <key> <string>_fday</string> </key>
+ <value> <string>Tuesday</string> </value>
+ </item>
+ <item>
+ <key> <string>_fmon</string> </key>
+ <value> <string>April</string> </value>
+ </item>
+ <item>
+ <key> <string>_hour</string> </key>
+ <value> <int>19</int> </value>
+ </item>
+ <item>
+ <key> <string>_millis</string> </key>
+ <value> <long>1113930453246</long> </value>
+ </item>
+ <item>
+ <key> <string>_minute</string> </key>
+ <value> <int>7</int> </value>
+ </item>
+ <item>
+ <key> <string>_month</string> </key>
+ <value> <int>4</int> </value>
+ </item>
+ <item>
+ <key> <string>_nearsec</string> </key>
+ <value> <float>33.0</float> </value>
+ </item>
+ <item>
+ <key> <string>_pday</string> </key>
+ <value> <string>Tue.</string> </value>
+ </item>
+ <item>
+ <key> <string>_pm</string> </key>
+ <value> <string>pm</string> </value>
+ </item>
+ <item>
+ <key> <string>_pmhour</string> </key>
+ <value> <int>7</int> </value>
+ </item>
+ <item>
+ <key> <string>_pmon</string> </key>
+ <value> <string>Apr.</string> </value>
+ </item>
+ <item>
+ <key> <string>_second</string> </key>
+ <value> <float>33.246</float> </value>
+ </item>
+ <item>
+ <key> <string>_t</string> </key>
+ <value> <float>1113930453.25</float> </value>
+ </item>
+ <item>
+ <key> <string>_tz</string> </key>
+ <value> <string>GMT+2</string> </value>
+ </item>
+ <item>
+ <key> <string>_year</string> </key>
+ <value> <int>2005</int> </value>
+ </item>
+ <item>
+ <key> <string>time</string> </key>
+ <value> <float>0.713579236115</float> </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ </dictionary>
+ <dictionary>
+ <item>
+ <key> <string>building_action</string> </key>
+ <value> <string>build</string> </value>
+ </item>
+ <item>
+ <key> <string>building_actor</string> </key>
+ <value> <string>yo</string> </value>
+ </item>
+ <item>
+ <key> <string>building_comment</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>building_state</string> </key>
+ <value> <string>built</string> </value>
+ </item>
+ <item>
+ <key> <string>building_time</string> </key>
+ <value>
+ <object>
+ <klass> <reference id="24.1"/> </klass>
+ <tuple>
+ <none/>
+ </tuple>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_aday</string> </key>
+ <value> <string>Tue</string> </value>
+ </item>
+ <item>
+ <key> <string>_amon</string> </key>
+ <value> <string>Apr</string> </value>
+ </item>
+ <item>
+ <key> <string>_d</string> </key>
+ <value> <float>38094.7135831</float> </value>
+ </item>
+ <item>
+ <key> <string>_day</string> </key>
+ <value> <int>19</int> </value>
+ </item>
+ <item>
+ <key> <string>_dayoffset</string> </key>
+ <value> <int>2</int> </value>
+ </item>
+ <item>
+ <key> <string>_fday</string> </key>
+ <value> <string>Tuesday</string> </value>
+ </item>
+ <item>
+ <key> <string>_fmon</string> </key>
+ <value> <string>April</string> </value>
+ </item>
+ <item>
+ <key> <string>_hour</string> </key>
+ <value> <int>19</int> </value>
+ </item>
+ <item>
+ <key> <string>_millis</string> </key>
+ <value> <long>1113930453583</long> </value>
+ </item>
+ <item>
+ <key> <string>_minute</string> </key>
+ <value> <int>7</int> </value>
+ </item>
+ <item>
+ <key> <string>_month</string> </key>
+ <value> <int>4</int> </value>
+ </item>
+ <item>
+ <key> <string>_nearsec</string> </key>
+ <value> <float>33.0</float> </value>
+ </item>
+ <item>
+ <key> <string>_pday</string> </key>
+ <value> <string>Tue.</string> </value>
+ </item>
+ <item>
+ <key> <string>_pm</string> </key>
+ <value> <string>pm</string> </value>
+ </item>
+ <item>
+ <key> <string>_pmhour</string> </key>
+ <value> <int>7</int> </value>
+ </item>
+ <item>
+ <key> <string>_pmon</string> </key>
+ <value> <string>Apr.</string> </value>
+ </item>
+ <item>
+ <key> <string>_second</string> </key>
+ <value> <float>33.583</float> </value>
+ </item>
+ <item>
+ <key> <string>_t</string> </key>
+ <value> <float>1113930453.58</float> </value>
+ </item>
+ <item>
+ <key> <string>_tz</string> </key>
+ <value> <string>GMT+2</string> </value>
+ </item>
+ <item>
+ <key> <string>_year</string> </key>
+ <value> <int>2005</int> </value>
+ </item>
+ <item>
+ <key> <string>time</string> </key>
+ <value> <float>0.713583136574</float> </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ </dictionary>
+ <dictionary>
+ <item>
+ <key> <string>building_action</string> </key>
+ <value> <string>build</string> </value>
+ </item>
+ <item>
+ <key> <string>building_actor</string> </key>
+ <value> <string>yo</string> </value>
+ </item>
+ <item>
+ <key> <string>building_comment</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>building_state</string> </key>
+ <value> <string>built</string> </value>
+ </item>
+ <item>
+ <key> <string>building_time</string> </key>
+ <value>
+ <object>
+ <klass> <reference id="24.1"/> </klass>
+ <tuple>
+ <none/>
+ </tuple>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_aday</string> </key>
+ <value> <string>Tue</string> </value>
+ </item>
+ <item>
+ <key> <string>_amon</string> </key>
+ <value> <string>Apr</string> </value>
+ </item>
+ <item>
+ <key> <string>_d</string> </key>
+ <value> <float>38094.7135832</float> </value>
+ </item>
+ <item>
+ <key> <string>_day</string> </key>
+ <value> <int>19</int> </value>
+ </item>
+ <item>
+ <key> <string>_dayoffset</string> </key>
+ <value> <int>2</int> </value>
+ </item>
+ <item>
+ <key> <string>_fday</string> </key>
+ <value> <string>Tuesday</string> </value>
+ </item>
+ <item>
+ <key> <string>_fmon</string> </key>
+ <value> <string>April</string> </value>
+ </item>
+ <item>
+ <key> <string>_hour</string> </key>
+ <value> <int>19</int> </value>
+ </item>
+ <item>
+ <key> <string>_millis</string> </key>
+ <value> <long>1113930453586</long> </value>
+ </item>
+ <item>
+ <key> <string>_minute</string> </key>
+ <value> <int>7</int> </value>
+ </item>
+ <item>
+ <key> <string>_month</string> </key>
+ <value> <int>4</int> </value>
+ </item>
+ <item>
+ <key> <string>_nearsec</string> </key>
+ <value> <float>33.0</float> </value>
+ </item>
+ <item>
+ <key> <string>_pday</string> </key>
+ <value> <string>Tue.</string> </value>
+ </item>
+ <item>
+ <key> <string>_pm</string> </key>
+ <value> <string>pm</string> </value>
+ </item>
+ <item>
+ <key> <string>_pmhour</string> </key>
+ <value> <int>7</int> </value>
+ </item>
+ <item>
+ <key> <string>_pmon</string> </key>
+ <value> <string>Apr.</string> </value>
+ </item>
+ <item>
+ <key> <string>_second</string> </key>
+ <value> <float>33.586</float> </value>
+ </item>
+ <item>
+ <key> <string>_t</string> </key>
+ <value> <float>1113930453.59</float> </value>
+ </item>
+ <item>
+ <key> <string>_tz</string> </key>
+ <value> <string>GMT+2</string> </value>
+ </item>
+ <item>
+ <key> <string>_year</string> </key>
+ <value> <int>2005</int> </value>
+ </item>
+ <item>
+ <key> <string>time</string> </key>
+ <value> <float>0.713583171295</float> </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ </dictionary>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>business_template_installation_workflow</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="25" aka="AAAAAAAAABk=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Persistence</string>
+ <string>PersistentMapping</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_container</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="26" aka="AAAAAAAAABo=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Persistence</string>
+ <string>PersistentMapping</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_container</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/AppliedRule_createMessageTable</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAADg=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/AppliedRule_deleteCatalog</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAADk=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/AppliedRule_deleteCategory</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAADo=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/AppliedRule_deleteMovement</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAADs=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/AppliedRule_deleteStock</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAADw=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/AppliedRule_insertCatalog</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAD0=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/AppliedRule_insertCategory</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAD4=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/AppliedRule_insertMovement</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAD8=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/AppliedRule_insertStock</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAEA=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/z0_drop_catalog</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAEE=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/z0_drop_category</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAEI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/z0_drop_compatibility</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAEM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/z0_drop_delivery</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAEQ=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/z0_drop_item</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAEU=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/z0_drop_movement</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAEY=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/z0_drop_predicate</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAEc=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/z0_drop_predicate_category</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAEg=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/z0_drop_roles_and_users</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAEk=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/z0_drop_stock</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAEo=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/z0_drop_subject</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAEs=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/z0_uncatalog_category</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAEw=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/z0_uncatalog_compatibility</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAE0=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/z0_uncatalog_item</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAE4=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/z0_uncatalog_movement</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAE8=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/z0_uncatalog_predicate</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAFA=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/z0_uncatalog_predicate_category</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAFE=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_catalog_compatibility_list</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z0_uncatalog_roles_and_users</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAFI=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_catalog_movement</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z0_uncatalog_stock</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAFM=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_catalog_movement_list</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z0_uncatalog_subject</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAFQ=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_catalog_object_list</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_catalog_category</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAFU=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_catalog_paths</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_catalog_category_list</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAFY=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_catalog_roles_and_users</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_catalog_compatibility</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAFc=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_catalog_roles_and_users_list</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_catalog_compatibility_list</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAFg=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_catalog_stock</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_catalog_item</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAFk=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_catalog_stock_list</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_catalog_item_list</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAFo=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_catalog_subject</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_catalog_movement</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAFs=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_catalog_subject_list</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_catalog_movement_list</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAFw=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_clear_reserved</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_catalog_object_list</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAF0=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_count_results</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_catalog_predicate</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAF4=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_create_catalog</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_catalog_predicate_category</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAF8=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_create_category</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_catalog_roles_and_users</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAGA=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_create_compatibility</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_catalog_roles_and_users_list</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAGE=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_create_delivery</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_catalog_stock</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAGI=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_create_movement</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_catalog_stock_list</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAGM=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_create_record</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_catalog_subject</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAGQ=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_create_roles_and_users</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_catalog_subject_list</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAGU=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_create_stock</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_count_results</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAGY=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_create_subject</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_create_catalog</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAGc=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_delete_recorded_object_list</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_create_category</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAGg=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_getitem_by_path</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_create_compatibility</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAGk=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_getitem_by_uid</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_create_delivery</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAGo=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_produce_reserved_uid_list</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_create_item</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAGs=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_read_recorded_object_list</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_create_movement</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAGw=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_record_catalog_object</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_create_predicate</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAG0=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_record_uncatalog_object</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_create_predicate_category</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAG4=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_related_mirror_section_uid_from_stock</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_create_roles_and_users</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAG8=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_related_node_uid_from_stock</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_create_stock</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAHA=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_related_payment_uid_from_stock</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_create_subject</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAHE=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_related_resource</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_related_mirror_section_uid_from_stock</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAHI=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_related_resource_uid_from_stock</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_related_node_uid_from_stock</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAHM=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_related_section_uid_from_stock</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_related_payment_uid_from_stock</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAHQ=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_related_security</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_related_predicate</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAHU=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_related_uid</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_related_resource</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAHY=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_search_folder</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_related_resource_uid_from_stock</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAHc=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_search_results</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_related_section_uid_from_stock</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAHg=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_show_category_columns</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_related_security</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAHk=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_show_columns</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_related_uid</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAHo=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_show_tables</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_search_folder</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAHs=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_uncatalog_delivery</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_search_results</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAHw=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_uncatalog_object</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_show_category_columns</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAH0=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_unique_values</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_uncatalog_delivery</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAH4=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_update_delivery</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_uncatalog_object</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAH8=</string> </persistent>
</value>
</item>
<item>
- <key> <string>portal_catalog/erp5_mysql/z_update_object</string> </key>
+ <key> <string>portal_catalog/erp5_mysql/z_update_delivery</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAIA=</string> </persistent>
</value>
</item>
+ <item>
+ <key> <string>portal_catalog/erp5_mysql/z_update_object</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAIE=</string> </persistent>
+ </value>
+ </item>
</dictionary>
</value>
</item>
@@ -3365,12 +4547,20 @@
<key> <string>z0_drop_delivery</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>z0_drop_item</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>z0_drop_movement</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z0_drop_record</string> </key>
+ <key> <string>z0_drop_predicate</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>z0_drop_predicate_category</string> </key>
<value> <int>0</int> </value>
</item>
<item>
@@ -3393,10 +4583,22 @@
<key> <string>z0_uncatalog_compatibility</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>z0_uncatalog_item</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>z0_uncatalog_movement</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>z0_uncatalog_predicate</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>z0_uncatalog_predicate_category</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>z0_uncatalog_roles_and_users</string> </key>
<value> <int>0</int> </value>
@@ -3425,6 +4627,14 @@
<key> <string>z_catalog_compatibility_list</string> </key>
<value> <int>1</int> </value>
</item>
+ <item>
+ <key> <string>z_catalog_item</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>z_catalog_item_list</string> </key>
+ <value> <int>1</int> </value>
+ </item>
<item>
<key> <string>z_catalog_movement</string> </key>
<value> <int>0</int> </value>
@@ -3438,7 +4648,11 @@
<value> <int>1</int> </value>
</item>
<item>
- <key> <string>z_catalog_paths</string> </key>
+ <key> <string>z_catalog_predicate</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>z_catalog_predicate_category</string> </key>
<value> <int>0</int> </value>
</item>
<item>
@@ -3465,10 +4679,6 @@
<key> <string>z_catalog_subject_list</string> </key>
<value> <int>1</int> </value>
</item>
- <item>
- <key> <string>z_clear_reserved</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>z_count_results</string> </key>
<value> <int>0</int> </value>
@@ -3490,51 +4700,31 @@
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_create_movement</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_create_record</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_create_roles_and_users</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_create_stock</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_create_subject</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_delete_recorded_object_list</string> </key>
+ <key> <string>z_create_item</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_getitem_by_path</string> </key>
+ <key> <string>z_create_movement</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_getitem_by_uid</string> </key>
+ <key> <string>z_create_predicate</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_produce_reserved_uid_list</string> </key>
+ <key> <string>z_create_predicate_category</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_read_recorded_object_list</string> </key>
+ <key> <string>z_create_roles_and_users</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_record_catalog_object</string> </key>
+ <key> <string>z_create_stock</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_record_uncatalog_object</string> </key>
+ <key> <string>z_create_subject</string> </key>
<value> <int>0</int> </value>
</item>
<item>
@@ -3549,6 +4739,10 @@
<key> <string>z_related_payment_uid_from_stock</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>z_related_predicate</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>z_related_resource</string> </key>
<value> <int>0</int> </value>
@@ -3581,14 +4775,6 @@
<key> <string>z_show_category_columns</string> </key>
<value> <int>0</int> </value>
</item>
- <item>
- <key> <string>z_show_columns</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_show_tables</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>z_uncatalog_delivery</string> </key>
<value> <int>0</int> </value>
@@ -3597,10 +4783,6 @@
<key> <string>z_uncatalog_object</string> </key>
<value> <int>0</int> </value>
</item>
- <item>
- <key> <string>z_unique_values</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>z_update_delivery</string> </key>
<value> <int>0</int> </value>
@@ -3683,12 +4865,20 @@
<key> <string>z0_drop_delivery</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>z0_drop_item</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>z0_drop_movement</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z0_drop_record</string> </key>
+ <key> <string>z0_drop_predicate</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>z0_drop_predicate_category</string> </key>
<value> <int>0</int> </value>
</item>
<item>
@@ -3711,10 +4901,22 @@
<key> <string>z0_uncatalog_compatibility</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>z0_uncatalog_item</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>z0_uncatalog_movement</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>z0_uncatalog_predicate</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>z0_uncatalog_predicate_category</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>z0_uncatalog_roles_and_users</string> </key>
<value> <int>0</int> </value>
@@ -3743,6 +4945,14 @@
<key> <string>z_catalog_compatibility_list</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>z_catalog_item</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>z_catalog_item_list</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>z_catalog_movement</string> </key>
<value> <int>1</int> </value>
@@ -3756,8 +4966,12 @@
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_catalog_paths</string> </key>
- <value> <int>0</int> </value>
+ <key> <string>z_catalog_predicate</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>z_catalog_predicate_category</string> </key>
+ <value> <int>1</int> </value>
</item>
<item>
<key> <string>z_catalog_roles_and_users</string> </key>
@@ -3783,10 +4997,6 @@
<key> <string>z_catalog_subject_list</string> </key>
<value> <int>0</int> </value>
</item>
- <item>
- <key> <string>z_clear_reserved</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>z_count_results</string> </key>
<value> <int>0</int> </value>
@@ -3808,51 +5018,31 @@
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_create_movement</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_create_record</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_create_roles_and_users</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_create_stock</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_create_subject</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_delete_recorded_object_list</string> </key>
+ <key> <string>z_create_item</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_getitem_by_path</string> </key>
+ <key> <string>z_create_movement</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_getitem_by_uid</string> </key>
+ <key> <string>z_create_predicate</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_produce_reserved_uid_list</string> </key>
+ <key> <string>z_create_predicate_category</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_read_recorded_object_list</string> </key>
+ <key> <string>z_create_roles_and_users</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_record_catalog_object</string> </key>
+ <key> <string>z_create_stock</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_record_uncatalog_object</string> </key>
+ <key> <string>z_create_subject</string> </key>
<value> <int>0</int> </value>
</item>
<item>
@@ -3867,6 +5057,10 @@
<key> <string>z_related_payment_uid_from_stock</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>z_related_predicate</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>z_related_resource</string> </key>
<value> <int>0</int> </value>
@@ -3899,14 +5093,6 @@
<key> <string>z_show_category_columns</string> </key>
<value> <int>0</int> </value>
</item>
- <item>
- <key> <string>z_show_columns</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_show_tables</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>z_uncatalog_delivery</string> </key>
<value> <int>0</int> </value>
@@ -3915,10 +5101,6 @@
<key> <string>z_uncatalog_object</string> </key>
<value> <int>0</int> </value>
</item>
- <item>
- <key> <string>z_unique_values</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>z_update_delivery</string> </key>
<value> <int>1</int> </value>
@@ -4001,12 +5183,20 @@
<key> <string>z0_drop_delivery</string> </key>
<value> <int>1</int> </value>
</item>
+ <item>
+ <key> <string>z0_drop_item</string> </key>
+ <value> <int>1</int> </value>
+ </item>
<item>
<key> <string>z0_drop_movement</string> </key>
<value> <int>1</int> </value>
</item>
<item>
- <key> <string>z0_drop_record</string> </key>
+ <key> <string>z0_drop_predicate</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>z0_drop_predicate_category</string> </key>
<value> <int>1</int> </value>
</item>
<item>
@@ -4029,10 +5219,22 @@
<key> <string>z0_uncatalog_compatibility</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>z0_uncatalog_item</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>z0_uncatalog_movement</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>z0_uncatalog_predicate</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>z0_uncatalog_predicate_category</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>z0_uncatalog_roles_and_users</string> </key>
<value> <int>0</int> </value>
@@ -4061,6 +5263,14 @@
<key> <string>z_catalog_compatibility_list</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>z_catalog_item</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>z_catalog_item_list</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>z_catalog_movement</string> </key>
<value> <int>0</int> </value>
@@ -4074,7 +5284,11 @@
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_catalog_paths</string> </key>
+ <key> <string>z_catalog_predicate</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>z_catalog_predicate_category</string> </key>
<value> <int>0</int> </value>
</item>
<item>
@@ -4101,10 +5315,6 @@
<key> <string>z_catalog_subject_list</string> </key>
<value> <int>0</int> </value>
</item>
- <item>
- <key> <string>z_clear_reserved</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>z_count_results</string> </key>
<value> <int>0</int> </value>
@@ -4126,52 +5336,32 @@
<value> <int>1</int> </value>
</item>
<item>
- <key> <string>z_create_movement</string> </key>
+ <key> <string>z_create_item</string> </key>
<value> <int>1</int> </value>
</item>
<item>
- <key> <string>z_create_record</string> </key>
+ <key> <string>z_create_movement</string> </key>
<value> <int>1</int> </value>
</item>
<item>
- <key> <string>z_create_roles_and_users</string> </key>
+ <key> <string>z_create_predicate</string> </key>
<value> <int>1</int> </value>
</item>
<item>
- <key> <string>z_create_stock</string> </key>
+ <key> <string>z_create_predicate_category</string> </key>
<value> <int>1</int> </value>
</item>
<item>
- <key> <string>z_create_subject</string> </key>
+ <key> <string>z_create_roles_and_users</string> </key>
<value> <int>1</int> </value>
</item>
<item>
- <key> <string>z_delete_recorded_object_list</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_getitem_by_path</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_getitem_by_uid</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_produce_reserved_uid_list</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_read_recorded_object_list</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_record_catalog_object</string> </key>
- <value> <int>0</int> </value>
+ <key> <string>z_create_stock</string> </key>
+ <value> <int>1</int> </value>
</item>
<item>
- <key> <string>z_record_uncatalog_object</string> </key>
- <value> <int>0</int> </value>
+ <key> <string>z_create_subject</string> </key>
+ <value> <int>1</int> </value>
</item>
<item>
<key> <string>z_related_mirror_section_uid_from_stock</string> </key>
@@ -4185,6 +5375,10 @@
<key> <string>z_related_payment_uid_from_stock</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>z_related_predicate</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>z_related_resource</string> </key>
<value> <int>0</int> </value>
@@ -4217,14 +5411,6 @@
<key> <string>z_show_category_columns</string> </key>
<value> <int>0</int> </value>
</item>
- <item>
- <key> <string>z_show_columns</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_show_tables</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>z_uncatalog_delivery</string> </key>
<value> <int>0</int> </value>
@@ -4233,10 +5419,6 @@
<key> <string>z_uncatalog_object</string> </key>
<value> <int>0</int> </value>
</item>
- <item>
- <key> <string>z_unique_values</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>z_update_delivery</string> </key>
<value> <int>0</int> </value>
@@ -4319,12 +5501,20 @@
<key> <string>z0_drop_delivery</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>z0_drop_item</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>z0_drop_movement</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z0_drop_record</string> </key>
+ <key> <string>z0_drop_predicate</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>z0_drop_predicate_category</string> </key>
<value> <int>0</int> </value>
</item>
<item>
@@ -4347,10 +5537,22 @@
<key> <string>z0_uncatalog_compatibility</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>z0_uncatalog_item</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>z0_uncatalog_movement</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>z0_uncatalog_predicate</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>z0_uncatalog_predicate_category</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>z0_uncatalog_roles_and_users</string> </key>
<value> <int>0</int> </value>
@@ -4379,6 +5581,14 @@
<key> <string>z_catalog_compatibility_list</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>z_catalog_item</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>z_catalog_item_list</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>z_catalog_movement</string> </key>
<value> <int>0</int> </value>
@@ -4392,7 +5602,11 @@
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_catalog_paths</string> </key>
+ <key> <string>z_catalog_predicate</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>z_catalog_predicate_category</string> </key>
<value> <int>0</int> </value>
</item>
<item>
@@ -4419,10 +5633,6 @@
<key> <string>z_catalog_subject_list</string> </key>
<value> <int>0</int> </value>
</item>
- <item>
- <key> <string>z_clear_reserved</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>z_count_results</string> </key>
<value> <int>0</int> </value>
@@ -4444,51 +5654,31 @@
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_create_movement</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_create_record</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_create_roles_and_users</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_create_stock</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_create_subject</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_delete_recorded_object_list</string> </key>
+ <key> <string>z_create_item</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_getitem_by_path</string> </key>
+ <key> <string>z_create_movement</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_getitem_by_uid</string> </key>
+ <key> <string>z_create_predicate</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_produce_reserved_uid_list</string> </key>
+ <key> <string>z_create_predicate_category</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_read_recorded_object_list</string> </key>
+ <key> <string>z_create_roles_and_users</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_record_catalog_object</string> </key>
+ <key> <string>z_create_stock</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_record_uncatalog_object</string> </key>
+ <key> <string>z_create_subject</string> </key>
<value> <int>0</int> </value>
</item>
<item>
@@ -4503,6 +5693,10 @@
<key> <string>z_related_payment_uid_from_stock</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>z_related_predicate</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>z_related_resource</string> </key>
<value> <int>0</int> </value>
@@ -4535,14 +5729,6 @@
<key> <string>z_show_category_columns</string> </key>
<value> <int>0</int> </value>
</item>
- <item>
- <key> <string>z_show_columns</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_show_tables</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>z_uncatalog_delivery</string> </key>
<value> <int>0</int> </value>
@@ -4551,10 +5737,6 @@
<key> <string>z_uncatalog_object</string> </key>
<value> <int>0</int> </value>
</item>
- <item>
- <key> <string>z_unique_values</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>z_update_delivery</string> </key>
<value> <int>0</int> </value>
@@ -4637,12 +5819,20 @@
<key> <string>z0_drop_delivery</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>z0_drop_item</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>z0_drop_movement</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z0_drop_record</string> </key>
+ <key> <string>z0_drop_predicate</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>z0_drop_predicate_category</string> </key>
<value> <int>0</int> </value>
</item>
<item>
@@ -4665,10 +5855,22 @@
<key> <string>z0_uncatalog_compatibility</string> </key>
<value> <int>1</int> </value>
</item>
+ <item>
+ <key> <string>z0_uncatalog_item</string> </key>
+ <value> <int>1</int> </value>
+ </item>
<item>
<key> <string>z0_uncatalog_movement</string> </key>
<value> <int>1</int> </value>
</item>
+ <item>
+ <key> <string>z0_uncatalog_predicate</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>z0_uncatalog_predicate_category</string> </key>
+ <value> <int>1</int> </value>
+ </item>
<item>
<key> <string>z0_uncatalog_roles_and_users</string> </key>
<value> <int>1</int> </value>
@@ -4697,6 +5899,14 @@
<key> <string>z_catalog_compatibility_list</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>z_catalog_item</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>z_catalog_item_list</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>z_catalog_movement</string> </key>
<value> <int>0</int> </value>
@@ -4710,7 +5920,11 @@
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_catalog_paths</string> </key>
+ <key> <string>z_catalog_predicate</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>z_catalog_predicate_category</string> </key>
<value> <int>0</int> </value>
</item>
<item>
@@ -4737,10 +5951,6 @@
<key> <string>z_catalog_subject_list</string> </key>
<value> <int>0</int> </value>
</item>
- <item>
- <key> <string>z_clear_reserved</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>z_count_results</string> </key>
<value> <int>0</int> </value>
@@ -4762,51 +5972,31 @@
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_create_movement</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_create_record</string> </key>
+ <key> <string>z_create_item</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_create_roles_and_users</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_create_stock</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_create_subject</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_delete_recorded_object_list</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_getitem_by_path</string> </key>
+ <key> <string>z_create_movement</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_getitem_by_uid</string> </key>
+ <key> <string>z_create_predicate</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_produce_reserved_uid_list</string> </key>
+ <key> <string>z_create_predicate_category</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_read_recorded_object_list</string> </key>
+ <key> <string>z_create_roles_and_users</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_record_catalog_object</string> </key>
+ <key> <string>z_create_stock</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_record_uncatalog_object</string> </key>
+ <key> <string>z_create_subject</string> </key>
<value> <int>0</int> </value>
</item>
<item>
@@ -4821,6 +6011,10 @@
<key> <string>z_related_payment_uid_from_stock</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>z_related_predicate</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>z_related_resource</string> </key>
<value> <int>0</int> </value>
@@ -4853,14 +6047,6 @@
<key> <string>z_show_category_columns</string> </key>
<value> <int>0</int> </value>
</item>
- <item>
- <key> <string>z_show_columns</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_show_tables</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>z_uncatalog_delivery</string> </key>
<value> <int>1</int> </value>
@@ -4869,10 +6055,6 @@
<key> <string>z_uncatalog_object</string> </key>
<value> <int>1</int> </value>
</item>
- <item>
- <key> <string>z_unique_values</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>z_update_delivery</string> </key>
<value> <int>0</int> </value>
@@ -4955,12 +6137,20 @@
<key> <string>z0_drop_delivery</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>z0_drop_item</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>z0_drop_movement</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z0_drop_record</string> </key>
+ <key> <string>z0_drop_predicate</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>z0_drop_predicate_category</string> </key>
<value> <int>0</int> </value>
</item>
<item>
@@ -4980,11 +6170,23 @@
<value> <int>1</int> </value>
</item>
<item>
- <key> <string>z0_uncatalog_compatibility</string> </key>
+ <key> <string>z0_uncatalog_compatibility</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>z0_uncatalog_item</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>z0_uncatalog_movement</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>z0_uncatalog_predicate</string> </key>
<value> <int>1</int> </value>
</item>
<item>
- <key> <string>z0_uncatalog_movement</string> </key>
+ <key> <string>z0_uncatalog_predicate_category</string> </key>
<value> <int>1</int> </value>
</item>
<item>
@@ -5015,6 +6217,14 @@
<key> <string>z_catalog_compatibility_list</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>z_catalog_item</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>z_catalog_item_list</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>z_catalog_movement</string> </key>
<value> <int>1</int> </value>
@@ -5028,8 +6238,12 @@
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_catalog_paths</string> </key>
- <value> <int>0</int> </value>
+ <key> <string>z_catalog_predicate</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>z_catalog_predicate_category</string> </key>
+ <value> <int>1</int> </value>
</item>
<item>
<key> <string>z_catalog_roles_and_users</string> </key>
@@ -5055,10 +6269,6 @@
<key> <string>z_catalog_subject_list</string> </key>
<value> <int>0</int> </value>
</item>
- <item>
- <key> <string>z_clear_reserved</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>z_count_results</string> </key>
<value> <int>0</int> </value>
@@ -5080,51 +6290,31 @@
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_create_movement</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_create_record</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_create_roles_and_users</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_create_stock</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_create_subject</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_delete_recorded_object_list</string> </key>
+ <key> <string>z_create_item</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_getitem_by_path</string> </key>
+ <key> <string>z_create_movement</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_getitem_by_uid</string> </key>
+ <key> <string>z_create_predicate</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_produce_reserved_uid_list</string> </key>
+ <key> <string>z_create_predicate_category</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_read_recorded_object_list</string> </key>
+ <key> <string>z_create_roles_and_users</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_record_catalog_object</string> </key>
+ <key> <string>z_create_stock</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>z_record_uncatalog_object</string> </key>
+ <key> <string>z_create_subject</string> </key>
<value> <int>0</int> </value>
</item>
<item>
@@ -5139,6 +6329,10 @@
<key> <string>z_related_payment_uid_from_stock</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>z_related_predicate</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>z_related_resource</string> </key>
<value> <int>0</int> </value>
@@ -5171,14 +6365,6 @@
<key> <string>z_show_category_columns</string> </key>
<value> <int>0</int> </value>
</item>
- <item>
- <key> <string>z_show_columns</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>z_show_tables</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>z_uncatalog_delivery</string> </key>
<value> <int>0</int> </value>
@@ -5187,10 +6373,6 @@
<key> <string>z_uncatalog_object</string> </key>
<value> <int>0</int> </value>
</item>
- <item>
- <key> <string>z_unique_values</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>z_update_delivery</string> </key>
<value> <int>1</int> </value>
@@ -5227,6 +6409,12 @@
<none/>
</value>
</item>
+ <item>
+ <key> <string>predicate_uid | predicate/uid/z_related_predicate</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
<item>
<key> <string>resourceType | movement,catalog/portal_type/z_related_resource</string> </key>
<value>
@@ -5343,12 +6531,30 @@
<none/>
</value>
</item>
+ <item>
+ <key> <string>delivery</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
<item>
<key> <string>movement</string> </key>
<value>
<none/>
</value>
</item>
+ <item>
+ <key> <string>predicate</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>predicate_category</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
<item>
<key> <string>roles_and_users</string> </key>
<value>
@@ -5704,6 +6910,27 @@
</pickle>
</record>
<record id="55" aka="AAAAAAAAADc=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Persistence</string>
+ <string>PersistentMapping</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_container</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="56" aka="AAAAAAAAADg=">
<pickle>
<tuple>
<tuple>
@@ -5871,7 +7098,7 @@ CREATE TABLE `message` (\n
</dictionary>
</pickle>
</record>
- <record id="56" aka="AAAAAAAAADg=">
+ <record id="57" aka="AAAAAAAAADk=">
<pickle>
<tuple>
<tuple>
@@ -6044,7 +7271,7 @@ WHERE\n
</dictionary>
</pickle>
</record>
- <record id="57" aka="AAAAAAAAADk=">
+ <record id="58" aka="AAAAAAAAADo=">
<pickle>
<tuple>
<tuple>
@@ -6215,7 +7442,7 @@ WHERE\n
</dictionary>
</pickle>
</record>
- <record id="58" aka="AAAAAAAAADo=">
+ <record id="59" aka="AAAAAAAAADs=">
<pickle>
<tuple>
<tuple>
@@ -6386,7 +7613,7 @@ WHERE\n
</dictionary>
</pickle>
</record>
- <record id="59" aka="AAAAAAAAADs=">
+ <record id="60" aka="AAAAAAAAADw=">
<pickle>
<tuple>
<tuple>
@@ -6557,7 +7784,7 @@ WHERE\n
</dictionary>
</pickle>
</record>
- <record id="60" aka="AAAAAAAAADw=">
+ <record id="61" aka="AAAAAAAAAD0=">
<pickle>
<tuple>
<tuple>
@@ -6728,7 +7955,7 @@ VALUES\n
</dictionary>
</pickle>
</record>
- <record id="61" aka="AAAAAAAAAD0=">
+ <record id="62" aka="AAAAAAAAAD4=">
<pickle>
<tuple>
<tuple>
@@ -6899,7 +8126,7 @@ VALUES\n
</dictionary>
</pickle>
</record>
- <record id="62" aka="AAAAAAAAAD4=">
+ <record id="63" aka="AAAAAAAAAD8=">
<pickle>
<tuple>
<tuple>
@@ -7070,7 +8297,7 @@ VALUES\n
</dictionary>
</pickle>
</record>
- <record id="63" aka="AAAAAAAAAD8=">
+ <record id="64" aka="AAAAAAAAAEA=">
<pickle>
<tuple>
<tuple>
@@ -7241,7 +8468,7 @@ VALUES\n
</dictionary>
</pickle>
</record>
- <record id="64" aka="AAAAAAAAAEA=">
+ <record id="65" aka="AAAAAAAAAEE=">
<pickle>
<tuple>
<tuple>
@@ -7389,7 +8616,7 @@ VALUES\n
</dictionary>
</pickle>
</record>
- <record id="65" aka="AAAAAAAAAEE=">
+ <record id="66" aka="AAAAAAAAAEI=">
<pickle>
<tuple>
<tuple>
@@ -7537,7 +8764,7 @@ VALUES\n
</dictionary>
</pickle>
</record>
- <record id="66" aka="AAAAAAAAAEI=">
+ <record id="67" aka="AAAAAAAAAEM=">
<pickle>
<tuple>
<tuple>
@@ -7685,7 +8912,7 @@ VALUES\n
</dictionary>
</pickle>
</record>
- <record id="67" aka="AAAAAAAAAEM=">
+ <record id="68" aka="AAAAAAAAAEQ=">
<pickle>
<tuple>
<tuple>
@@ -7813,7 +9040,7 @@ VALUES\n
</dictionary>
</pickle>
</record>
- <record id="68" aka="AAAAAAAAAEQ=">
+ <record id="69" aka="AAAAAAAAAEU=">
<pickle>
<tuple>
<tuple>
@@ -7867,6 +9094,18 @@ VALUES\n
</object>
</value>
</item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <tuple>
+ <list>
+ <string>nexedi</string>
+ <string>acl_users</string>
+ </list>
+ <string>jp</string>
+ </tuple>
+ </value>
+ </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -7901,7 +9140,7 @@ VALUES\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z0_drop_movement</string> </value>
+ <value> <string>z0_drop_item</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -7913,7 +9152,7 @@ VALUES\n
</item>
<item>
<key> <string>src</string> </key>
- <value> <string>DROP TABLE movement</string> </value>
+ <value> <string>DROP TABLE item</string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -7947,7 +9186,7 @@ VALUES\n
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string>DROP TABLE movement</string> </value>
+ <value> <string>DROP TABLE item</string> </value>
</item>
</dictionary>
</state>
@@ -7961,7 +9200,7 @@ VALUES\n
</dictionary>
</pickle>
</record>
- <record id="69" aka="AAAAAAAAAEU=">
+ <record id="70" aka="AAAAAAAAAEY=">
<pickle>
<tuple>
<tuple>
@@ -8038,30 +9277,158 @@ VALUES\n
<value> <string></string> </value>
</item>
<item>
- <key> <string>connection_hook</string> </key>
+ <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>z0_drop_movement</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>DROP TABLE movement</string> </value>
+ </item>
+ <item>
+ <key> <string>template</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+ </klass>
+ <none/>
+ <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>DROP TABLE movement</string> </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="71" aka="AAAAAAAAAEc=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.ZSQLMethods.SQL</string>
+ <string>SQL</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>yo</string> </key>
+ <value>
+ <list>
+ <string>Owner</string>
+ </list>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <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/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_keys</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
<value>
- <none/>
+ <tuple>
+ <list>
+ <string>nexedi</string>
+ <string>acl_users</string>
+ </list>
+<string>yo</string>
+ </tuple>
</value>
</item>
+ <item>
+ <key> <string>arguments_src</string> </key>
+ <value> <string></string> </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>z0_drop_record</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>
+ <value> <string>z0_drop_predicate</string> </value>
</item>
<item>
<key> <string>src</string> </key>
- <value> <string>DROP TABLE record</string> </value>
+ <value> <string>DROP TABLE predicate</string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -8095,7 +9462,7 @@ VALUES\n
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string>DROP TABLE record</string> </value>
+ <value> <string>DROP TABLE predicate</string> </value>
</item>
</dictionary>
</state>
@@ -8109,7 +9476,7 @@ VALUES\n
</dictionary>
</pickle>
</record>
- <record id="70" aka="AAAAAAAAAEY=">
+ <record id="72" aka="AAAAAAAAAEg=">
<pickle>
<tuple>
<tuple>
@@ -8126,7 +9493,7 @@ VALUES\n
<value>
<dictionary>
<item>
- <key> <string>alex</string> </key>
+ <key> <string>yo</string> </key>
<value>
<list>
<string>Owner</string>
@@ -8164,52 +9531,32 @@ VALUES\n
</value>
</item>
<item>
- <key> <string>allow_simple_one_argument_traversal</string> </key>
+ <key> <string>_owner</string> </key>
<value>
- <none/>
+ <tuple>
+ <list>
+ <string>nexedi</string>
+ <string>acl_users</string>
+ </list>
+<string>yo</string>
+ </tuple>
</value>
</item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string></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>z0_drop_roles_and_users</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>
+ <value> <string>z0_drop_predicate_category</string> </value>
</item>
<item>
<key> <string>src</string> </key>
- <value> <string>DROP TABLE roles_and_users</string> </value>
+ <value> <string>DROP TABLE predicate_category</string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -8243,7 +9590,7 @@ VALUES\n
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string>DROP TABLE roles_and_users</string> </value>
+ <value> <string>DROP TABLE predicate_category</string> </value>
</item>
</dictionary>
</state>
@@ -8257,7 +9604,7 @@ VALUES\n
</dictionary>
</pickle>
</record>
- <record id="71" aka="AAAAAAAAAEc=">
+ <record id="73" aka="AAAAAAAAAEk=">
<pickle>
<tuple>
<tuple>
@@ -8345,7 +9692,7 @@ VALUES\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z0_drop_stock</string> </value>
+ <value> <string>z0_drop_roles_and_users</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -8357,7 +9704,7 @@ VALUES\n
</item>
<item>
<key> <string>src</string> </key>
- <value> <string>DROP TABLE stock</string> </value>
+ <value> <string>DROP TABLE roles_and_users</string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -8391,7 +9738,7 @@ VALUES\n
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string>DROP TABLE stock</string> </value>
+ <value> <string>DROP TABLE roles_and_users</string> </value>
</item>
</dictionary>
</state>
@@ -8405,7 +9752,7 @@ VALUES\n
</dictionary>
</pickle>
</record>
- <record id="72" aka="AAAAAAAAAEg=">
+ <record id="74" aka="AAAAAAAAAEo=">
<pickle>
<tuple>
<tuple>
@@ -8493,7 +9840,7 @@ VALUES\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z0_drop_subject</string> </value>
+ <value> <string>z0_drop_stock</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -8505,7 +9852,7 @@ VALUES\n
</item>
<item>
<key> <string>src</string> </key>
- <value> <string>DROP TABLE subject</string> </value>
+ <value> <string>DROP TABLE stock</string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -8539,7 +9886,7 @@ VALUES\n
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string>DROP TABLE subject</string> </value>
+ <value> <string>DROP TABLE stock</string> </value>
</item>
</dictionary>
</state>
@@ -8553,7 +9900,7 @@ VALUES\n
</dictionary>
</pickle>
</record>
- <record id="73" aka="AAAAAAAAAEk=">
+ <record id="75" aka="AAAAAAAAAEs=">
<pickle>
<tuple>
<tuple>
@@ -8593,22 +9940,13 @@ VALUES\n
<item>
<key> <string>_data</string> </key>
<value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
+ <dictionary/>
</value>
</item>
<item>
<key> <string>_keys</string> </key>
<value>
- <list>
-<string>uid</string>
- </list>
+ <list/>
</value>
</item>
</dictionary>
@@ -8624,7 +9962,7 @@ VALUES\n
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>uid</string> </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -8650,7 +9988,7 @@ VALUES\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z0_uncatalog_category</string> </value>
+ <value> <string>z0_drop_subject</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -8662,11 +10000,7 @@ VALUES\n
</item>
<item>
<key> <string>src</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM category WHERE <dtml-sqltest uid op=eq type=int>
-
-]]></string> </value>
+ <value> <string>DROP TABLE subject</string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -8700,11 +10034,7 @@ DELETE FROM category WHERE <dtml-sqltest uid op=eq type=int>
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM category WHERE <dtml-sqltest uid op=eq type=int>
-
-]]></string> </value>
+ <value> <string>DROP TABLE subject</string> </value>
</item>
</dictionary>
</state>
@@ -8718,7 +10048,7 @@ DELETE FROM category WHERE <dtml-sqltest uid op=eq type=int>
</dictionary>
</pickle>
</record>
- <record id="74" aka="AAAAAAAAAEo=">
+ <record id="76" aka="AAAAAAAAAEw=">
<pickle>
<tuple>
<tuple>
@@ -8815,7 +10145,7 @@ DELETE FROM category WHERE <dtml-sqltest uid op=eq type=int>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z0_uncatalog_compatibility</string> </value>
+ <value> <string>z0_uncatalog_category</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -8829,7 +10159,7 @@ DELETE FROM category WHERE <dtml-sqltest uid op=eq type=int>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-DELETE FROM compatibility WHERE <dtml-sqltest uid op=eq type=int>
+DELETE FROM category WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
@@ -8867,7 +10197,7 @@ DELETE FROM compatibility WHERE <dtml-sqltest uid op=eq type=int>
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-DELETE FROM compatibility WHERE <dtml-sqltest uid op=eq type=int>
+DELETE FROM category WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
@@ -8883,7 +10213,7 @@ DELETE FROM compatibility WHERE <dtml-sqltest uid op=eq type=int>
</dictionary>
</pickle>
</record>
- <record id="75" aka="AAAAAAAAAEs=">
+ <record id="77" aka="AAAAAAAAAE0=">
<pickle>
<tuple>
<tuple>
@@ -8980,7 +10310,7 @@ DELETE FROM compatibility WHERE <dtml-sqltest uid op=eq type=int>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z0_uncatalog_movement</string> </value>
+ <value> <string>z0_uncatalog_compatibility</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -8994,7 +10324,7 @@ DELETE FROM compatibility WHERE <dtml-sqltest uid op=eq type=int>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-DELETE FROM movement WHERE <dtml-sqltest uid op=eq type=int>
+DELETE FROM compatibility WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
@@ -9032,7 +10362,7 @@ DELETE FROM movement WHERE <dtml-sqltest uid op=eq type=int>
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-DELETE FROM movement WHERE <dtml-sqltest uid op=eq type=int>
+DELETE FROM compatibility WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
@@ -9048,7 +10378,7 @@ DELETE FROM movement WHERE <dtml-sqltest uid op=eq type=int>
</dictionary>
</pickle>
</record>
- <record id="76" aka="AAAAAAAAAEw=">
+ <record id="78" aka="AAAAAAAAAE4=">
<pickle>
<tuple>
<tuple>
@@ -9111,6 +10441,18 @@ DELETE FROM movement WHERE <dtml-sqltest uid op=eq type=int>
</object>
</value>
</item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <tuple>
+ <list>
+ <string>nexedi</string>
+ <string>acl_users</string>
+ </list>
+ <string>jp</string>
+ </tuple>
+ </value>
+ </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -9145,7 +10487,7 @@ DELETE FROM movement WHERE <dtml-sqltest uid op=eq type=int>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z0_uncatalog_roles_and_users</string> </value>
+ <value> <string>z0_uncatalog_item</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -9159,7 +10501,7 @@ DELETE FROM movement WHERE <dtml-sqltest uid op=eq type=int>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-DELETE FROM roles_and_users WHERE <dtml-sqltest uid op=eq type=int>
+DELETE FROM item WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
@@ -9197,7 +10539,7 @@ DELETE FROM roles_and_users WHERE <dtml-sqltest uid op=eq type=int>
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-DELETE FROM roles_and_users WHERE <dtml-sqltest uid op=eq type=int>
+DELETE FROM item WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
@@ -9213,7 +10555,7 @@ DELETE FROM roles_and_users WHERE <dtml-sqltest uid op=eq type=int>
</dictionary>
</pickle>
</record>
- <record id="77" aka="AAAAAAAAAE0=">
+ <record id="79" aka="AAAAAAAAAE8=">
<pickle>
<tuple>
<tuple>
@@ -9310,7 +10652,7 @@ DELETE FROM roles_and_users WHERE <dtml-sqltest uid op=eq type=int>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z0_uncatalog_stock</string> </value>
+ <value> <string>z0_uncatalog_movement</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -9324,7 +10666,7 @@ DELETE FROM roles_and_users WHERE <dtml-sqltest uid op=eq type=int>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-DELETE FROM stock WHERE <dtml-sqltest uid op=eq type=int>
+DELETE FROM movement WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
@@ -9362,7 +10704,7 @@ DELETE FROM stock WHERE <dtml-sqltest uid op=eq type=int>
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-DELETE FROM stock WHERE <dtml-sqltest uid op=eq type=int>
+DELETE FROM movement WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
@@ -9378,7 +10720,7 @@ DELETE FROM stock WHERE <dtml-sqltest uid op=eq type=int>
</dictionary>
</pickle>
</record>
- <record id="78" aka="AAAAAAAAAE4=">
+ <record id="80" aka="AAAAAAAAAFA=">
<pickle>
<tuple>
<tuple>
@@ -9395,7 +10737,7 @@ DELETE FROM stock WHERE <dtml-sqltest uid op=eq type=int>
<value>
<dictionary>
<item>
- <key> <string>alex</string> </key>
+ <key> <string>yo</string> </key>
<value>
<list>
<string>Owner</string>
@@ -9442,54 +10784,34 @@ DELETE FROM stock WHERE <dtml-sqltest uid op=eq type=int>
</value>
</item>
<item>
- <key> <string>allow_simple_one_argument_traversal</string> </key>
+ <key> <string>_owner</string> </key>
<value>
- <none/>
+ <tuple>
+ <list>
+ <string>nexedi</string>
+ <string>acl_users</string>
+ </list>
+<string>yo</string>
+ </tuple>
</value>
</item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>uid</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>z0_uncatalog_subject</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>
+ <value> <string>z0_uncatalog_predicate</string> </value>
</item>
<item>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-DELETE FROM subject WHERE <dtml-sqltest uid op=eq type=int>
+DELETE FROM predicate WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
@@ -9527,7 +10849,7 @@ DELETE FROM subject WHERE <dtml-sqltest uid op=eq type=int>
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-DELETE FROM subject WHERE <dtml-sqltest uid op=eq type=int>
+DELETE FROM predicate WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
@@ -9543,7 +10865,7 @@ DELETE FROM subject WHERE <dtml-sqltest uid op=eq type=int>
</dictionary>
</pickle>
</record>
- <record id="79" aka="AAAAAAAAAE8=">
+ <record id="81" aka="AAAAAAAAAFE=">
<pickle>
<tuple>
<tuple>
@@ -9560,7 +10882,7 @@ DELETE FROM subject WHERE <dtml-sqltest uid op=eq type=int>
<value>
<dictionary>
<item>
- <key> <string>alex</string> </key>
+ <key> <string>yo</string> </key>
<value>
<list>
<string>Owner</string>
@@ -9584,24 +10906,6 @@ DELETE FROM subject WHERE <dtml-sqltest uid op=eq type=int>
<key> <string>_data</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>getAcquiredCategoryList</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getCategoryList</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isMovement</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
<item>
<key> <string>uid</string> </key>
<value>
@@ -9611,110 +10915,48 @@ DELETE FROM subject WHERE <dtml-sqltest uid op=eq type=int>
</dictionary>
</value>
</item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
-<string>uid</string>
-<string>getAcquiredCategoryList</string>
-<string>getCategoryList</string>
-<string>isMovement</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>uid\r\n
-getAcquiredCategoryList\r\n
-getCategoryList\r\n
-isMovement</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>
+ <key> <string>_keys</string> </key>
+ <value>
+ <list>
+<string>uid</string>
+ </list>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
</item>
<item>
- <key> <string>connection_hook</string> </key>
+ <key> <string>_owner</string> </key>
<value>
- <none/>
+ <tuple>
+ <list>
+ <string>nexedi</string>
+ <string>acl_users</string>
+ </list>
+<string>yo</string>
+ </tuple>
</value>
</item>
+ <item>
+ <key> <string>arguments_src</string> </key>
+ <value> <string>uid</string> </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_catalog_category</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>
+ <value> <string>z0_uncatalog_predicate_category</string> </value>
</item>
<item>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-if isMovement>\n
-<dtml-if getCategoryList>\n
-<dtml-let uid_list="portal_categories.getCategoryParentUidList(getCategoryList)">\n
-<dtml-if uid_list>\n
-INSERT INTO category VALUES \n
-<dtml-in "uid_list">\n
-(<dtml-sqlvar uid type="int">, <dtml-var "_[\'sequence-item\'][0]" >, <dtml-var "_[\'sequence-item\'][1]" >, <dtml-var "_[\'sequence-item\'][2]" >)\n
-<dtml-if \n
-sequence-end><dtml-else>,</dtml-if>\n
-</dtml-in> \n
-;\n
-<dtml-else>\n
-INSERT INTO category VALUES (<dtml-sqlvar uid type="int">, NULL, NULL,1);\n
-</dtml-if>\n
-</dtml-let>\n
-<dtml-else>\n
-INSERT INTO category VALUES (<dtml-sqlvar uid type="int">, NULL, NULL,1);\n
-</dtml-if>\n
-<dtml-else>\n
-<dtml-if getAcquiredCategoryList>\n
-<dtml-let uid_list="portal_categories.getCategoryParentUidList(getAcquiredCategoryList)">\n
-<dtml-if uid_list>\n
-INSERT INTO category VALUES \n
-<dtml-in "uid_list">\n
-(<dtml-sqlvar uid type="int">, <dtml-var "_[\'sequence-item\'][0]" >, <dtml-var "_[\'sequence-item\'][1]" >, <dtml-var "_[\'sequence-item\'][2]" >)\n
-<dtml-if \n
-sequence-end><dtml-else>,</dtml-if>\n
-</dtml-in> \n
-;\n
-<dtml-else>\n
-INSERT INTO category VALUES (<dtml-sqlvar uid type="int">, NULL, NULL,1);\n
-</dtml-if>\n
-</dtml-let>\n
-<dtml-else>\n
-INSERT INTO category VALUES (<dtml-sqlvar uid type="int">, NULL, NULL,1);\n
-</dtml-if>\n
-</dtml-if>
+DELETE FROM predicate_category WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
@@ -9752,43 +10994,7 @@ INSERT INTO category VALUES (<dtml-sqlvar uid type="int">, NULL, NULL,1);\n
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-if isMovement>\n
-<dtml-if getCategoryList>\n
-<dtml-let uid_list="portal_categories.getCategoryParentUidList(getCategoryList)">\n
-<dtml-if uid_list>\n
-INSERT INTO category VALUES \n
-<dtml-in "uid_list">\n
-(<dtml-sqlvar uid type="int">, <dtml-var "_[\'sequence-item\'][0]" >, <dtml-var "_[\'sequence-item\'][1]" >, <dtml-var "_[\'sequence-item\'][2]" >)\n
-<dtml-if \n
-sequence-end><dtml-else>,</dtml-if>\n
-</dtml-in> \n
-;\n
-<dtml-else>\n
-INSERT INTO category VALUES (<dtml-sqlvar uid type="int">, NULL, NULL,1);\n
-</dtml-if>\n
-</dtml-let>\n
-<dtml-else>\n
-INSERT INTO category VALUES (<dtml-sqlvar uid type="int">, NULL, NULL,1);\n
-</dtml-if>\n
-<dtml-else>\n
-<dtml-if getAcquiredCategoryList>\n
-<dtml-let uid_list="portal_categories.getCategoryParentUidList(getAcquiredCategoryList)">\n
-<dtml-if uid_list>\n
-INSERT INTO category VALUES \n
-<dtml-in "uid_list">\n
-(<dtml-sqlvar uid type="int">, <dtml-var "_[\'sequence-item\'][0]" >, <dtml-var "_[\'sequence-item\'][1]" >, <dtml-var "_[\'sequence-item\'][2]" >)\n
-<dtml-if \n
-sequence-end><dtml-else>,</dtml-if>\n
-</dtml-in> \n
-;\n
-<dtml-else>\n
-INSERT INTO category VALUES (<dtml-sqlvar uid type="int">, NULL, NULL,1);\n
-</dtml-if>\n
-</dtml-let>\n
-<dtml-else>\n
-INSERT INTO category VALUES (<dtml-sqlvar uid type="int">, NULL, NULL,1);\n
-</dtml-if>\n
-</dtml-if>
+DELETE FROM predicate_category WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
@@ -9804,7 +11010,7 @@ INSERT INTO category VALUES (<dtml-sqlvar uid type="int">, NULL, NULL,1);\n
</dictionary>
</pickle>
</record>
- <record id="80" aka="AAAAAAAAAFA=">
+ <record id="82" aka="AAAAAAAAAFI=">
<pickle>
<tuple>
<tuple>
@@ -9845,24 +11051,6 @@ INSERT INTO category VALUES (<dtml-sqlvar uid type="int">, NULL, NULL,1);\n
<key> <string>_data</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>getAcquiredCategoryList</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getCategoryList</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isMovement</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
<item>
<key> <string>uid</string> </key>
<value>
@@ -9876,135 +11064,64 @@ INSERT INTO category VALUES (<dtml-sqlvar uid type="int">, NULL, NULL,1);\n
<key> <string>_keys</string> </key>
<value>
<list>
-<string>uid</string>
-<string>isMovement</string>
-<string>getCategoryList</string>
-<string>getAcquiredCategoryList</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>uid\r\n
-isMovement\r\n
-getCategoryList\r\n
-getAcquiredCategoryList</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_catalog_category_list</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[
-
-INSERT INTO category VALUES\n
-<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
-<dtml-if sequence-start><dtml-else>,</dtml-if>\n
- <dtml-if "isMovement[loop_item]">\n
- <dtml-if expr="getCategoryList[loop_item]">\n
- <dtml-let uid_list="portal_categories.getCategoryParentUidList(getCategoryList[loop_item])">\n
- <dtml-if uid_list>\n
- <dtml-in prefix="uid" expr="uid_list">\n
-<dtml-if sequence-start><dtml-else>,</dtml-if>\n
-(\n
- <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
- <dtml-sqlvar expr="uid_item[0]" type="int">,\n
- <dtml-sqlvar expr="uid_item[1]" type="int">,\n
- <dtml-sqlvar expr="uid_item[2]" type="int">\n
-)\n
- </dtml-in> \n
- <dtml-else>\n
-(\n
- <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
- NULL,\n
- NULL,\n
- 1\n
-)\n
- </dtml-if>\n
- </dtml-let>\n
- <dtml-else>\n
-(\n
- <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
- NULL,\n
- NULL,\n
- 1\n
-)\n
- </dtml-if>\n
- <dtml-else>\n
- <dtml-if expr="getAcquiredCategoryList[loop_item]">\n
- <dtml-let uid_list="portal_categories.getCategoryParentUidList(getAcquiredCategoryList[loop_item])">\n
- <dtml-if uid_list>\n
- <dtml-in prefix="uid" expr="uid_list">\n
-<dtml-if sequence-start><dtml-else>,</dtml-if>\n
-(\n
- <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
- <dtml-sqlvar expr="uid_item[0]" type="int">,\n
- <dtml-sqlvar expr="uid_item[1]" type="int">,\n
- <dtml-sqlvar expr="uid_item[2]" type="int">\n
-)\n
- </dtml-in> \n
- <dtml-else>\n
-(\n
- <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
- NULL,\n
- NULL,\n
- 1\n
-)\n
- </dtml-if>\n
- </dtml-let>\n
- <dtml-else>\n
-(\n
- <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
- NULL,\n
- NULL,\n
- 1\n
-)\n
- </dtml-if>\n
- </dtml-if>\n
-</dtml-in> \n
+<string>uid</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>uid</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>z0_uncatalog_roles_and_users</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[
+DELETE FROM roles_and_users WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
@@ -10042,72 +11159,7 @@ INSERT INTO category VALUES\n
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-INSERT INTO category VALUES\n
-<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
-<dtml-if sequence-start><dtml-else>,</dtml-if>\n
- <dtml-if "isMovement[loop_item]">\n
- <dtml-if expr="getCategoryList[loop_item]">\n
- <dtml-let uid_list="portal_categories.getCategoryParentUidList(getCategoryList[loop_item])">\n
- <dtml-if uid_list>\n
- <dtml-in prefix="uid" expr="uid_list">\n
-<dtml-if sequence-start><dtml-else>,</dtml-if>\n
-(\n
- <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
- <dtml-sqlvar expr="uid_item[0]" type="int">,\n
- <dtml-sqlvar expr="uid_item[1]" type="int">,\n
- <dtml-sqlvar expr="uid_item[2]" type="int">\n
-)\n
- </dtml-in> \n
- <dtml-else>\n
-(\n
- <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
- NULL,\n
- NULL,\n
- 1\n
-)\n
- </dtml-if>\n
- </dtml-let>\n
- <dtml-else>\n
-(\n
- <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
- NULL,\n
- NULL,\n
- 1\n
-)\n
- </dtml-if>\n
- <dtml-else>\n
- <dtml-if expr="getAcquiredCategoryList[loop_item]">\n
- <dtml-let uid_list="portal_categories.getCategoryParentUidList(getAcquiredCategoryList[loop_item])">\n
- <dtml-if uid_list>\n
- <dtml-in prefix="uid" expr="uid_list">\n
-<dtml-if sequence-start><dtml-else>,</dtml-if>\n
-(\n
- <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
- <dtml-sqlvar expr="uid_item[0]" type="int">,\n
- <dtml-sqlvar expr="uid_item[1]" type="int">,\n
- <dtml-sqlvar expr="uid_item[2]" type="int">\n
-)\n
- </dtml-in> \n
- <dtml-else>\n
-(\n
- <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
- NULL,\n
- NULL,\n
- 1\n
-)\n
- </dtml-if>\n
- </dtml-let>\n
- <dtml-else>\n
-(\n
- <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
- NULL,\n
- NULL,\n
- 1\n
-)\n
- </dtml-if>\n
- </dtml-if>\n
-</dtml-in> \n
-
+DELETE FROM roles_and_users WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
@@ -10123,7 +11175,7 @@ INSERT INTO category VALUES\n
</dictionary>
</pickle>
</record>
- <record id="81" aka="AAAAAAAAAFE=">
+ <record id="83" aka="AAAAAAAAAFM=">
<pickle>
<tuple>
<tuple>
@@ -10136,136 +11188,34 @@ INSERT INTO category VALUES\n
<pickle>
<dictionary>
<item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>alex</string> </key>
- <value>
- <list>
- <string>Owner</string>
- </list>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <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>Creator</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>Date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>EffectiveDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>ExpiresDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>ModificationDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>PrincipiaSearchSource</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>SearchableText</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>Type</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>bobobase_modification_time</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>created</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>effective</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>expires</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getIcon</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>in_reply_to</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>modified</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>review_state</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>summary</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alex</string> </key>
+ <value>
+ <list>
+ <string>Owner</string>
+ </list>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <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>uid</string> </key>
<value>
@@ -10280,23 +11230,6 @@ INSERT INTO category VALUES\n
<value>
<list>
<string>uid</string>
-<string>Creator</string>
-<string>Date</string>
-<string>PrincipiaSearchSource</string>
-<string>SearchableText</string>
-<string>EffectiveDate</string>
-<string>ExpiresDate</string>
-<string>ModificationDate</string>
-<string>Type</string>
-<string>bobobase_modification_time</string>
-<string>created</string>
-<string>effective</string>
-<string>expires</string>
-<string>getIcon</string>
-<string>in_reply_to</string>
-<string>modified</string>
-<string>review_state</string>
-<string>summary</string>
</list>
</value>
</item>
@@ -10313,25 +11246,7 @@ INSERT INTO category VALUES\n
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>uid\r\n
-Creator\r\n
-Date\r\n
-PrincipiaSearchSource\r\n
-SearchableText\r\n
-EffectiveDate\r\n
-ExpiresDate\r\n
-ModificationDate\r\n
-Type\r\n
-bobobase_modification_time\r\n
-created\r\n
-effective\r\n
-expires\r\n
-getIcon\r\n
-in_reply_to\r\n
-modified\r\n
-review_state\r\n
-summary\r\n
-</string> </value>
+ <value> <string>uid</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -10357,7 +11272,7 @@ summary\r\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_catalog_compatibility</string> </value>
+ <value> <string>z0_uncatalog_stock</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -10371,26 +11286,7 @@ summary\r\n
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-INSERT INTO compatibility VALUES (\n
- <dtml-sqlvar uid type="int">,\n
- <dtml-sqlvar Creator type="string" optional>,\n
- <dtml-sqlvar Date type="string" optional>,\n
- <dtml-sqlvar PrincipiaSearchSource type="string" optional>,\n
- <dtml-sqlvar SearchableText type="string" optional>,\n
- <dtml-sqlvar EffectiveDate type="string" optional>,\n
- <dtml-sqlvar ExpiresDate type="string" optional>,\n
- <dtml-sqlvar ModificationDate type="string" optional>,\n
- <dtml-sqlvar Type type="string" optional>,\n
- <dtml-sqlvar bobobase_modification_time type="string" optional>,\n
- <dtml-sqlvar created type="string" optional>,\n
- <dtml-sqlvar effective type="string" optional>,\n
- <dtml-sqlvar expires type="string" optional>,\n
- <dtml-sqlvar getIcon type="string" optional>,\n
- <dtml-sqlvar in_reply_to type="string" optional>,\n
- <dtml-sqlvar modified type="string" optional>,\n
- <dtml-sqlvar review_state type="string" optional>,\n
- <dtml-sqlvar summary type="string" optional>\n
-);
+DELETE FROM stock WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
@@ -10428,26 +11324,7 @@ INSERT INTO compatibility VALUES (\n
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-INSERT INTO compatibility VALUES (\n
- <dtml-sqlvar uid type="int">,\n
- <dtml-sqlvar Creator type="string" optional>,\n
- <dtml-sqlvar Date type="string" optional>,\n
- <dtml-sqlvar PrincipiaSearchSource type="string" optional>,\n
- <dtml-sqlvar SearchableText type="string" optional>,\n
- <dtml-sqlvar EffectiveDate type="string" optional>,\n
- <dtml-sqlvar ExpiresDate type="string" optional>,\n
- <dtml-sqlvar ModificationDate type="string" optional>,\n
- <dtml-sqlvar Type type="string" optional>,\n
- <dtml-sqlvar bobobase_modification_time type="string" optional>,\n
- <dtml-sqlvar created type="string" optional>,\n
- <dtml-sqlvar effective type="string" optional>,\n
- <dtml-sqlvar expires type="string" optional>,\n
- <dtml-sqlvar getIcon type="string" optional>,\n
- <dtml-sqlvar in_reply_to type="string" optional>,\n
- <dtml-sqlvar modified type="string" optional>,\n
- <dtml-sqlvar review_state type="string" optional>,\n
- <dtml-sqlvar summary type="string" optional>\n
-);
+DELETE FROM stock WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
@@ -10463,7 +11340,7 @@ INSERT INTO compatibility VALUES (\n
</dictionary>
</pickle>
</record>
- <record id="82" aka="AAAAAAAAAFI=">
+ <record id="84" aka="AAAAAAAAAFQ=">
<pickle>
<tuple>
<tuple>
@@ -10504,108 +11381,6 @@ INSERT INTO compatibility VALUES (\n
<key> <string>_data</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>Creator</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>Date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>EffectiveDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>ExpiresDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>ModificationDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>PrincipiaSearchSource</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>SearchableText</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>Type</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>bobobase_modification_time</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>created</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>effective</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>expires</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getIcon</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>in_reply_to</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>modified</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>review_state</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>summary</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
<item>
<key> <string>uid</string> </key>
<value>
@@ -10620,23 +11395,6 @@ INSERT INTO compatibility VALUES (\n
<value>
<list>
<string>uid</string>
-<string>Creator</string>
-<string>Date</string>
-<string>PrincipiaSearchSource</string>
-<string>SearchableText</string>
-<string>EffectiveDate</string>
-<string>ExpiresDate</string>
-<string>ModificationDate</string>
-<string>Type</string>
-<string>bobobase_modification_time</string>
-<string>created</string>
-<string>effective</string>
-<string>expires</string>
-<string>getIcon</string>
-<string>in_reply_to</string>
-<string>modified</string>
-<string>review_state</string>
-<string>summary</string>
</list>
</value>
</item>
@@ -10646,32 +11404,14 @@ INSERT INTO compatibility VALUES (\n
</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>uid\r\n
-Creator\r\n
-Date\r\n
-PrincipiaSearchSource\r\n
-SearchableText\r\n
-EffectiveDate\r\n
-ExpiresDate\r\n
-ModificationDate\r\n
-Type\r\n
-bobobase_modification_time\r\n
-created\r\n
-effective\r\n
-expires\r\n
-getIcon\r\n
-in_reply_to\r\n
-modified\r\n
-review_state\r\n
-summary\r\n
-</string> </value>
+ <key> <string>allow_simple_one_argument_traversal</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>arguments_src</string> </key>
+ <value> <string>uid</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -10697,7 +11437,7 @@ summary\r\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_catalog_compatibility_list</string> </value>
+ <value> <string>z0_uncatalog_subject</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -10711,36 +11451,7 @@ summary\r\n
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-INSERT INTO\n
- compatibility\n
-VALUES\n
-<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
-(\n
- <dtml-sqlvar expr="uid[loop_item]" type="int">, \n
- <dtml-sqlvar expr="Creator[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="Date[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="PrincipiaSearchSource[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="SearchableText[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="EffectiveDate[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="ExpiresDate[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="ModificationDate[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="Type[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="bobobase_modification_time[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="created[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="effective[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="expires[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getIcon[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="in_reply_to[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="modified[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="review_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="summary[loop_item]" type="string" optional>\n
-)\n
-<dtml-if sequence-end>\n
-<dtml-else>\n
-,\n
-</dtml-if>\n
-</dtml-in>\n
-
+DELETE FROM subject WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
@@ -10778,36 +11489,7 @@ VALUES\n
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-INSERT INTO\n
- compatibility\n
-VALUES\n
-<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
-(\n
- <dtml-sqlvar expr="uid[loop_item]" type="int">, \n
- <dtml-sqlvar expr="Creator[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="Date[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="PrincipiaSearchSource[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="SearchableText[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="EffectiveDate[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="ExpiresDate[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="ModificationDate[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="Type[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="bobobase_modification_time[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="created[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="effective[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="expires[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getIcon[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="in_reply_to[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="modified[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="review_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="summary[loop_item]" type="string" optional>\n
-)\n
-<dtml-if sequence-end>\n
-<dtml-else>\n
-,\n
-</dtml-if>\n
-</dtml-in>\n
-
+DELETE FROM subject WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
@@ -10823,7 +11505,7 @@ VALUES\n
</dictionary>
</pickle>
</record>
- <record id="83" aka="AAAAAAAAAFM=">
+ <record id="85" aka="AAAAAAAAAFU=">
<pickle>
<tuple>
<tuple>
@@ -10865,103 +11547,13 @@ VALUES\n
<value>
<dictionary>
<item>
- <key> <string>getDeliveryUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDestinationUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getNetConvertedQuantity</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getNetConvertedTargetQuantity</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getPrice</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getResourceUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSourceUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getStartDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getStopDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getTargetStartDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getTargetStopDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getTargetTotalPrice</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getTotalPrice</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getVariationText</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>hasCellContent</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isAccountable</string> </key>
+ <key> <string>getAcquiredCategoryList</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>isDeliverable</string> </key>
+ <key> <string>getCategoryList</string> </key>
<value>
<dictionary/>
</value>
@@ -10972,12 +11564,6 @@ VALUES\n
<dictionary/>
</value>
</item>
- <item>
- <key> <string>isOrderable</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
<item>
<key> <string>uid</string> </key>
<value>
@@ -10991,26 +11577,10 @@ VALUES\n
<key> <string>_keys</string> </key>
<value>
<list>
-<string>isMovement</string>
<string>uid</string>
-<string>getDeliveryUid</string>
-<string>getSourceUid</string>
-<string>getDestinationUid</string>
-<string>getResourceUid</string>
-<string>getNetConvertedQuantity</string>
-<string>getStartDate</string>
-<string>getStopDate</string>
-<string>getNetConvertedTargetQuantity</string>
-<string>getTargetStartDate</string>
-<string>getTargetStopDate</string>
-<string>getPrice</string>
-<string>getTotalPrice</string>
-<string>getTargetTotalPrice</string>
-<string>hasCellContent</string>
-<string>isAccountable</string>
-<string>isOrderable</string>
-<string>isDeliverable</string>
-<string>getVariationText</string>
+<string>getAcquiredCategoryList</string>
+<string>getCategoryList</string>
+<string>isMovement</string>
</list>
</value>
</item>
@@ -11027,26 +11597,10 @@ VALUES\n
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>isMovement\r\n
-uid\r\n
-getDeliveryUid\r\n
-getSourceUid\r\n
-getDestinationUid\r\n
-getResourceUid\r\n
-getNetConvertedQuantity\r\n
-getStartDate\r\n
-getStopDate\r\n
-getNetConvertedTargetQuantity\r\n
-getTargetStartDate\r\n
-getTargetStopDate\r\n
-getPrice\r\n
-getTotalPrice\r\n
-getTargetTotalPrice\r\n
-hasCellContent\r\n
-isAccountable\r\n
-isOrderable\r\n
-isDeliverable\r\n
-getVariationText</string> </value>
+ <value> <string>uid\r\n
+getAcquiredCategoryList\r\n
+getCategoryList\r\n
+isMovement</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -11072,7 +11626,7 @@ getVariationText</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_catalog_movement</string> </value>
+ <value> <string>z_catalog_category</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -11087,28 +11641,41 @@ getVariationText</string> </value>
<value> <string encoding="cdata"><![CDATA[
<dtml-if isMovement>\n
-INSERT INTO movement VALUES ( \n
- <dtml-sqlvar uid type="int">,\n
- <dtml-if getDeliveryUid><dtml-sqlvar getDeliveryUid type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getSourceUid><dtml-sqlvar getSourceUid type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getDestinationUid ><dtml-sqlvar getDestinationUid type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getResourceUid><dtml-sqlvar getResourceUid type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getNetConvertedQuantity><dtml-sqlvar getNetConvertedQuantity type="float"><dtml-else>NULL</dtml-if>,\n
- NULL,\n
- <dtml-if getStartDate><dtml-sqlvar getStartDate type="string"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getStopDate><dtml-sqlvar getStopDate type="string"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getNetConvertedTargetQuantity><dtml-sqlvar getNetConvertedTargetQuantity type="float"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getTargetStartDate><dtml-sqlvar getTargetStartDate type="string"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getTargetStopDate><dtml-sqlvar getTargetStopDate type="string"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getPrice><dtml-sqlvar getPrice type="float"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getTotalPrice><dtml-sqlvar getTotalPrice type="float"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getTargetTotalPrice><dtml-sqlvar getTargetTotalPrice type="float"><dtml-else>NULL</dtml-if>,\n
- <dtml-if "hasCellContent is not None"><dtml-sqlvar hasCellContent type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if "isAccountable is not None"><dtml-sqlvar isAccountable type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if "isOrderable is not None"><dtml-sqlvar isOrderable type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if "isDeliverable is not None"><dtml-sqlvar isDeliverable type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if "getVariationText is not None"><dtml-sqlvar getVariationText type="string"><dtml-else>NULL</dtml-if>\n
-);\n
+<dtml-if getCategoryList>\n
+<dtml-let uid_list="portal_categories.getCategoryParentUidList(getCategoryList)">\n
+<dtml-if uid_list>\n
+INSERT INTO category VALUES \n
+<dtml-in "uid_list">\n
+(<dtml-sqlvar uid type="int">, <dtml-var "_[\'sequence-item\'][0]" >, <dtml-var "_[\'sequence-item\'][1]" >, <dtml-var "_[\'sequence-item\'][2]" >)\n
+<dtml-if \n
+sequence-end><dtml-else>,</dtml-if>\n
+</dtml-in> \n
+;\n
+<dtml-else>\n
+INSERT INTO category VALUES (<dtml-sqlvar uid type="int">, NULL, NULL,1);\n
+</dtml-if>\n
+</dtml-let>\n
+<dtml-else>\n
+INSERT INTO category VALUES (<dtml-sqlvar uid type="int">, NULL, NULL,1);\n
+</dtml-if>\n
+<dtml-else>\n
+<dtml-if getAcquiredCategoryList>\n
+<dtml-let uid_list="portal_categories.getCategoryParentUidList(getAcquiredCategoryList)">\n
+<dtml-if uid_list>\n
+INSERT INTO category VALUES \n
+<dtml-in "uid_list">\n
+(<dtml-sqlvar uid type="int">, <dtml-var "_[\'sequence-item\'][0]" >, <dtml-var "_[\'sequence-item\'][1]" >, <dtml-var "_[\'sequence-item\'][2]" >)\n
+<dtml-if \n
+sequence-end><dtml-else>,</dtml-if>\n
+</dtml-in> \n
+;\n
+<dtml-else>\n
+INSERT INTO category VALUES (<dtml-sqlvar uid type="int">, NULL, NULL,1);\n
+</dtml-if>\n
+</dtml-let>\n
+<dtml-else>\n
+INSERT INTO category VALUES (<dtml-sqlvar uid type="int">, NULL, NULL,1);\n
+</dtml-if>\n
</dtml-if>
]]></string> </value>
@@ -11148,28 +11715,41 @@ INSERT INTO movement VALUES ( \n
<value> <string encoding="cdata"><![CDATA[
<dtml-if isMovement>\n
-INSERT INTO movement VALUES ( \n
- <dtml-sqlvar uid type="int">,\n
- <dtml-if getDeliveryUid><dtml-sqlvar getDeliveryUid type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getSourceUid><dtml-sqlvar getSourceUid type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getDestinationUid ><dtml-sqlvar getDestinationUid type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getResourceUid><dtml-sqlvar getResourceUid type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getNetConvertedQuantity><dtml-sqlvar getNetConvertedQuantity type="float"><dtml-else>NULL</dtml-if>,\n
- NULL,\n
- <dtml-if getStartDate><dtml-sqlvar getStartDate type="string"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getStopDate><dtml-sqlvar getStopDate type="string"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getNetConvertedTargetQuantity><dtml-sqlvar getNetConvertedTargetQuantity type="float"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getTargetStartDate><dtml-sqlvar getTargetStartDate type="string"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getTargetStopDate><dtml-sqlvar getTargetStopDate type="string"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getPrice><dtml-sqlvar getPrice type="float"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getTotalPrice><dtml-sqlvar getTotalPrice type="float"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getTargetTotalPrice><dtml-sqlvar getTargetTotalPrice type="float"><dtml-else>NULL</dtml-if>,\n
- <dtml-if "hasCellContent is not None"><dtml-sqlvar hasCellContent type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if "isAccountable is not None"><dtml-sqlvar isAccountable type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if "isOrderable is not None"><dtml-sqlvar isOrderable type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if "isDeliverable is not None"><dtml-sqlvar isDeliverable type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if "getVariationText is not None"><dtml-sqlvar getVariationText type="string"><dtml-else>NULL</dtml-if>\n
-);\n
+<dtml-if getCategoryList>\n
+<dtml-let uid_list="portal_categories.getCategoryParentUidList(getCategoryList)">\n
+<dtml-if uid_list>\n
+INSERT INTO category VALUES \n
+<dtml-in "uid_list">\n
+(<dtml-sqlvar uid type="int">, <dtml-var "_[\'sequence-item\'][0]" >, <dtml-var "_[\'sequence-item\'][1]" >, <dtml-var "_[\'sequence-item\'][2]" >)\n
+<dtml-if \n
+sequence-end><dtml-else>,</dtml-if>\n
+</dtml-in> \n
+;\n
+<dtml-else>\n
+INSERT INTO category VALUES (<dtml-sqlvar uid type="int">, NULL, NULL,1);\n
+</dtml-if>\n
+</dtml-let>\n
+<dtml-else>\n
+INSERT INTO category VALUES (<dtml-sqlvar uid type="int">, NULL, NULL,1);\n
+</dtml-if>\n
+<dtml-else>\n
+<dtml-if getAcquiredCategoryList>\n
+<dtml-let uid_list="portal_categories.getCategoryParentUidList(getAcquiredCategoryList)">\n
+<dtml-if uid_list>\n
+INSERT INTO category VALUES \n
+<dtml-in "uid_list">\n
+(<dtml-sqlvar uid type="int">, <dtml-var "_[\'sequence-item\'][0]" >, <dtml-var "_[\'sequence-item\'][1]" >, <dtml-var "_[\'sequence-item\'][2]" >)\n
+<dtml-if \n
+sequence-end><dtml-else>,</dtml-if>\n
+</dtml-in> \n
+;\n
+<dtml-else>\n
+INSERT INTO category VALUES (<dtml-sqlvar uid type="int">, NULL, NULL,1);\n
+</dtml-if>\n
+</dtml-let>\n
+<dtml-else>\n
+INSERT INTO category VALUES (<dtml-sqlvar uid type="int">, NULL, NULL,1);\n
+</dtml-if>\n
</dtml-if>
]]></string> </value>
@@ -11186,7 +11766,7 @@ INSERT INTO movement VALUES ( \n
</dictionary>
</pickle>
</record>
- <record id="84" aka="AAAAAAAAAFQ=">
+ <record id="86" aka="AAAAAAAAAFY=">
<pickle>
<tuple>
<tuple>
@@ -11228,103 +11808,13 @@ INSERT INTO movement VALUES ( \n
<value>
<dictionary>
<item>
- <key> <string>getDestinationUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getExplanationUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getInventoriatedStartDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getInventoriatedStopDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getNetConvertedQuantity</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getNetConvertedTargetQuantity</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getPrice</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getResourceUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSourceUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getTargetStartDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getTargetStopDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getTargetTotalPrice</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getTotalPrice</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getVariationText</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>hasCellContent</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isAccountable</string> </key>
+ <key> <string>getAcquiredCategoryList</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>isDeliverable</string> </key>
+ <key> <string>getCategoryList</string> </key>
<value>
<dictionary/>
</value>
@@ -11335,12 +11825,6 @@ INSERT INTO movement VALUES ( \n
<dictionary/>
</value>
</item>
- <item>
- <key> <string>isOrderable</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
<item>
<key> <string>uid</string> </key>
<value>
@@ -11354,26 +11838,10 @@ INSERT INTO movement VALUES ( \n
<key> <string>_keys</string> </key>
<value>
<list>
-<string>isMovement</string>
<string>uid</string>
-<string>getExplanationUid</string>
-<string>getSourceUid</string>
-<string>getDestinationUid</string>
-<string>getResourceUid</string>
-<string>getNetConvertedQuantity</string>
-<string>getInventoriatedStartDate</string>
-<string>getInventoriatedStopDate</string>
-<string>getNetConvertedTargetQuantity</string>
-<string>getTargetStartDate</string>
-<string>getTargetStopDate</string>
-<string>getPrice</string>
-<string>getTotalPrice</string>
-<string>getTargetTotalPrice</string>
-<string>hasCellContent</string>
-<string>isAccountable</string>
-<string>isOrderable</string>
-<string>isDeliverable</string>
-<string>getVariationText</string>
+<string>isMovement</string>
+<string>getCategoryList</string>
+<string>getAcquiredCategoryList</string>
</list>
</value>
</item>
@@ -11390,26 +11858,10 @@ INSERT INTO movement VALUES ( \n
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>isMovement\r\n
-uid\r\n
-getExplanationUid\r\n
-getSourceUid\r\n
-getDestinationUid\r\n
-getResourceUid\r\n
-getNetConvertedQuantity\r\n
-getInventoriatedStartDate\r\n
-getInventoriatedStopDate\r\n
-getNetConvertedTargetQuantity\r\n
-getTargetStartDate\r\n
-getTargetStopDate\r\n
-getPrice\r\n
-getTotalPrice\r\n
-getTargetTotalPrice\r\n
-hasCellContent\r\n
-isAccountable\r\n
-isOrderable\r\n
-isDeliverable\r\n
-getVariationText</string> </value>
+ <value> <string>uid\r\n
+isMovement\r\n
+getCategoryList\r\n
+getAcquiredCategoryList</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -11435,7 +11887,7 @@ getVariationText</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_catalog_movement_list</string> </value>
+ <value> <string>z_catalog_category_list</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -11449,43 +11901,71 @@ getVariationText</string> </value>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-let movement_list="[]">\n
- <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
- <dtml-if "isMovement[loop_item]">\n
- <dtml-call expr="movement_list.append(loop_item)">\n
+INSERT INTO category VALUES\n
+<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
+<dtml-if sequence-start><dtml-else>,</dtml-if>\n
+ <dtml-if "isMovement[loop_item]">\n
+ <dtml-if expr="getCategoryList[loop_item]">\n
+ <dtml-let uid_list="portal_categories.getCategoryParentUidList(getCategoryList[loop_item])">\n
+ <dtml-if uid_list>\n
+ <dtml-in prefix="uid" expr="uid_list">\n
+<dtml-if sequence-start><dtml-else>,</dtml-if>\n
+(\n
+ <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
+ <dtml-sqlvar expr="uid_item[0]" type="int">,\n
+ <dtml-sqlvar expr="uid_item[1]" type="int">,\n
+ <dtml-sqlvar expr="uid_item[2]" type="int">\n
+)\n
+ </dtml-in> \n
+ <dtml-else>\n
+(\n
+ <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
+ NULL,\n
+ NULL,\n
+ 1\n
+)\n
+ </dtml-if>\n
+ </dtml-let>\n
+ <dtml-else>\n
+(\n
+ <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
+ NULL,\n
+ NULL,\n
+ 1\n
+)\n
</dtml-if>\n
- </dtml-in>\n
- <dtml-if expr="len(movement_list) > 0">\n
-INSERT INTO\n
- movement\n
-VALUES\n
- <dtml-in prefix="loop" expr="movement_list">\n
-( \n
+ <dtml-else>\n
+ <dtml-if expr="getAcquiredCategoryList[loop_item]">\n
+ <dtml-let uid_list="portal_categories.getCategoryParentUidList(getAcquiredCategoryList[loop_item])">\n
+ <dtml-if uid_list>\n
+ <dtml-in prefix="uid" expr="uid_list">\n
+<dtml-if sequence-start><dtml-else>,</dtml-if>\n
+(\n
+ <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
+ <dtml-sqlvar expr="uid_item[0]" type="int">,\n
+ <dtml-sqlvar expr="uid_item[1]" type="int">,\n
+ <dtml-sqlvar expr="uid_item[2]" type="int">\n
+)\n
+ </dtml-in> \n
+ <dtml-else>\n
+(\n
<dtml-sqlvar expr="uid[loop_item]" type="int">,\n
- <dtml-sqlvar expr="getExplanationUid[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getSourceUid[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getDestinationUid[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getResourceUid[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getNetConvertedQuantity[loop_item]" type="float" optional>,\n
NULL,\n
- <dtml-sqlvar expr="getInventoriatedStartDate[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getInventoriatedStopDate[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getNetConvertedTargetQuantity[loop_item]" type="float" optional>,\n
- <dtml-sqlvar expr="getTargetStartDate[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getTargetStopDate[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getPrice[loop_item]" type="float" optional>,\n
- <dtml-sqlvar expr="getTotalPrice[loop_item]" type="float" optional>,\n
- <dtml-sqlvar expr="getTargetTotalPrice[loop_item]" type="float" optional>,\n
- <dtml-sqlvar expr="hasCellContent[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="isAccountable[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="isOrderable[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="isDeliverable[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getVariationText[loop_item]" type="string" optional>\n
+ NULL,\n
+ 1\n
)\n
-<dtml-if sequence-end><dtml-else>,</dtml-if>\n
- </dtml-in>\n
+ </dtml-if>\n
+ </dtml-let>\n
+ <dtml-else>\n
+(\n
+ <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
+ NULL,\n
+ NULL,\n
+ 1\n
+)\n
+ </dtml-if>\n
</dtml-if>\n
-</dtml-let>\n
+</dtml-in> \n
]]></string> </value>
@@ -11524,43 +12004,71 @@ VALUES\n
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-let movement_list="[]">\n
- <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
- <dtml-if "isMovement[loop_item]">\n
- <dtml-call expr="movement_list.append(loop_item)">\n
+INSERT INTO category VALUES\n
+<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
+<dtml-if sequence-start><dtml-else>,</dtml-if>\n
+ <dtml-if "isMovement[loop_item]">\n
+ <dtml-if expr="getCategoryList[loop_item]">\n
+ <dtml-let uid_list="portal_categories.getCategoryParentUidList(getCategoryList[loop_item])">\n
+ <dtml-if uid_list>\n
+ <dtml-in prefix="uid" expr="uid_list">\n
+<dtml-if sequence-start><dtml-else>,</dtml-if>\n
+(\n
+ <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
+ <dtml-sqlvar expr="uid_item[0]" type="int">,\n
+ <dtml-sqlvar expr="uid_item[1]" type="int">,\n
+ <dtml-sqlvar expr="uid_item[2]" type="int">\n
+)\n
+ </dtml-in> \n
+ <dtml-else>\n
+(\n
+ <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
+ NULL,\n
+ NULL,\n
+ 1\n
+)\n
+ </dtml-if>\n
+ </dtml-let>\n
+ <dtml-else>\n
+(\n
+ <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
+ NULL,\n
+ NULL,\n
+ 1\n
+)\n
</dtml-if>\n
- </dtml-in>\n
- <dtml-if expr="len(movement_list) > 0">\n
-INSERT INTO\n
- movement\n
-VALUES\n
- <dtml-in prefix="loop" expr="movement_list">\n
-( \n
+ <dtml-else>\n
+ <dtml-if expr="getAcquiredCategoryList[loop_item]">\n
+ <dtml-let uid_list="portal_categories.getCategoryParentUidList(getAcquiredCategoryList[loop_item])">\n
+ <dtml-if uid_list>\n
+ <dtml-in prefix="uid" expr="uid_list">\n
+<dtml-if sequence-start><dtml-else>,</dtml-if>\n
+(\n
+ <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
+ <dtml-sqlvar expr="uid_item[0]" type="int">,\n
+ <dtml-sqlvar expr="uid_item[1]" type="int">,\n
+ <dtml-sqlvar expr="uid_item[2]" type="int">\n
+)\n
+ </dtml-in> \n
+ <dtml-else>\n
+(\n
<dtml-sqlvar expr="uid[loop_item]" type="int">,\n
- <dtml-sqlvar expr="getExplanationUid[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getSourceUid[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getDestinationUid[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getResourceUid[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getNetConvertedQuantity[loop_item]" type="float" optional>,\n
NULL,\n
- <dtml-sqlvar expr="getInventoriatedStartDate[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getInventoriatedStopDate[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getNetConvertedTargetQuantity[loop_item]" type="float" optional>,\n
- <dtml-sqlvar expr="getTargetStartDate[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getTargetStopDate[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getPrice[loop_item]" type="float" optional>,\n
- <dtml-sqlvar expr="getTotalPrice[loop_item]" type="float" optional>,\n
- <dtml-sqlvar expr="getTargetTotalPrice[loop_item]" type="float" optional>,\n
- <dtml-sqlvar expr="hasCellContent[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="isAccountable[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="isOrderable[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="isDeliverable[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getVariationText[loop_item]" type="string" optional>\n
+ NULL,\n
+ 1\n
)\n
-<dtml-if sequence-end><dtml-else>,</dtml-if>\n
- </dtml-in>\n
+ </dtml-if>\n
+ </dtml-let>\n
+ <dtml-else>\n
+(\n
+ <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
+ NULL,\n
+ NULL,\n
+ 1\n
+)\n
+ </dtml-if>\n
</dtml-if>\n
-</dtml-let>\n
+</dtml-in> \n
]]></string> </value>
@@ -11577,7 +12085,7 @@ VALUES\n
</dictionary>
</pickle>
</record>
- <record id="85" aka="AAAAAAAAAFU=">
+ <record id="87" aka="AAAAAAAAAFc=">
<pickle>
<tuple>
<tuple>
@@ -11619,199 +12127,103 @@ VALUES\n
<value>
<dictionary>
<item>
- <key> <string>CreationDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>causality_state</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>discussion_state</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>event_state</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDefaultCausalityId</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDefaultDestinationReference</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDefaultDestinationSectionTitle</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDefaultDestinationTitle</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDefaultSourceReference</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDefaultSourceSectionTitle</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDefaultSourceTitle</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDescription</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDestinationReference</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getEan13Code</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getFloatIndex</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getIntIndex</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getLocation</string> </key>
+ <key> <string>Creator</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getOrderId</string> </key>
+ <key> <string>Date</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getParentUid</string> </key>
+ <key> <string>EffectiveDate</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getPath</string> </key>
+ <key> <string>ExpiresDate</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getPortalType</string> </key>
+ <key> <string>ModificationDate</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getReference</string> </key>
+ <key> <string>PrincipiaSearchSource</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getRelativeUrl</string> </key>
+ <key> <string>SearchableText</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getSourceReference</string> </key>
+ <key> <string>Type</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getStringIndex</string> </key>
+ <key> <string>bobobase_modification_time</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getTitle</string> </key>
+ <key> <string>created</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>id</string> </key>
+ <key> <string>effective</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>invoice_state</string> </key>
+ <key> <string>expires</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>meta_type</string> </key>
+ <key> <string>getIcon</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>opportunity_state</string> </key>
+ <key> <string>in_reply_to</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>payment_state</string> </key>
+ <key> <string>modified</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>security_uid</string> </key>
+ <key> <string>review_state</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>simulation_state</string> </key>
+ <key> <string>summary</string> </key>
<value>
<dictionary/>
</value>
@@ -11822,12 +12234,6 @@ VALUES\n
<dictionary/>
</value>
</item>
- <item>
- <key> <string>validation_state</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
</dictionary>
</value>
</item>
@@ -11836,40 +12242,23 @@ VALUES\n
<value>
<list>
<string>uid</string>
-<string>security_uid</string>
-<string>getPath</string>
-<string>getRelativeUrl</string>
-<string>getParentUid</string>
-<string>id</string>
-<string>CreationDate</string>
-<string>getDescription</string>
-<string>getTitle</string>
-<string>meta_type</string>
-<string>getPortalType</string>
-<string>opportunity_state</string>
-<string>getDefaultSourceReference</string>
-<string>getDefaultDestinationReference</string>
-<string>getDefaultSourceTitle</string>
-<string>getDefaultDestinationTitle</string>
-<string>getDefaultSourceSectionTitle</string>
-<string>getDefaultDestinationSectionTitle</string>
-<string>getDefaultCausalityId</string>
-<string>getLocation</string>
-<string>getEan13Code</string>
-<string>simulation_state</string>
-<string>causality_state</string>
-<string>discussion_state</string>
-<string>invoice_state</string>
-<string>getOrderId</string>
-<string>validation_state</string>
-<string>payment_state</string>
-<string>event_state</string>
-<string>getReference</string>
-<string>getSourceReference</string>
-<string>getDestinationReference</string>
-<string>getStringIndex</string>
-<string>getIntIndex</string>
-<string>getFloatIndex</string>
+<string>Creator</string>
+<string>Date</string>
+<string>PrincipiaSearchSource</string>
+<string>SearchableText</string>
+<string>EffectiveDate</string>
+<string>ExpiresDate</string>
+<string>ModificationDate</string>
+<string>Type</string>
+<string>bobobase_modification_time</string>
+<string>created</string>
+<string>effective</string>
+<string>expires</string>
+<string>getIcon</string>
+<string>in_reply_to</string>
+<string>modified</string>
+<string>review_state</string>
+<string>summary</string>
</list>
</value>
</item>
@@ -11887,40 +12276,24 @@ VALUES\n
<item>
<key> <string>arguments_src</string> </key>
<value> <string>uid\r\n
-security_uid\r\n
-getPath\r\n
-getRelativeUrl\r\n
-getParentUid\r\n
-id\r\n
-CreationDate\r\n
-getDescription\r\n
-getTitle\r\n
-meta_type\r\n
-getPortalType\r\n
-opportunity_state\r\n
-getDefaultSourceReference\r\n
-getDefaultDestinationReference\r\n
-getDefaultSourceTitle\r\n
-getDefaultDestinationTitle\r\n
-getDefaultSourceSectionTitle\r\n
-getDefaultDestinationSectionTitle\r\n
-getDefaultCausalityId\r\n
-getLocation\r\n
-getEan13Code\r\n
-simulation_state\r\n
-causality_state\r\n
-discussion_state\r\n
-invoice_state\r\n
-getOrderId\r\n
-validation_state\r\n
-payment_state\r\n
-event_state\r\n
-getReference\r\n
-getSourceReference\r\n
-getDestinationReference\n
-getStringIndex\n
-getIntIndex\n
-getFloatIndex</string> </value>
+Creator\r\n
+Date\r\n
+PrincipiaSearchSource\r\n
+SearchableText\r\n
+EffectiveDate\r\n
+ExpiresDate\r\n
+ModificationDate\r\n
+Type\r\n
+bobobase_modification_time\r\n
+created\r\n
+effective\r\n
+expires\r\n
+getIcon\r\n
+in_reply_to\r\n
+modified\r\n
+review_state\r\n
+summary\r\n
+</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -11946,7 +12319,7 @@ getFloatIndex</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_catalog_object_list</string> </value>
+ <value> <string>z_catalog_compatibility</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -11960,51 +12333,26 @@ getFloatIndex</string> </value>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-INSERT INTO\n
- catalog\n
-VALUES\n
-<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
-(\n
- <dtml-sqlvar expr="uid[loop_item]" type="int">, \n
- <dtml-sqlvar expr="security_uid[loop_item]" type="int">,\n
- <dtml-sqlvar expr="getPath[loop_item]" type="string">,\n
- <dtml-sqlvar expr="getRelativeUrl[loop_item]" type="string">,\n
- <dtml-sqlvar expr="getParentUid[loop_item]" type="int">,\n
- <dtml-sqlvar expr="id[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="CreationDate[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getDescription[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getTitle[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="meta_type[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getPortalType[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="opportunity_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getDefaultSourceReference[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getDefaultDestinationReference[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getDefaultSourceTitle[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getDefaultDestinationTitle[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getDefaultSourceSectionTitle[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getDefaultDestinationSectionTitle[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getDefaultCausalityId[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getLocation[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getEan13Code[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="validation_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="simulation_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="causality_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="discussion_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="payment_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="event_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="invoice_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getOrderId[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getReference[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getSourceReference[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getDestinationReference[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getStringIndex[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getIntIndex[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getFloatIndex[loop_item]" type="float" optional>\n
-\n
-)\n
-<dtml-if sequence-end><dtml-else>,</dtml-if>\n
-</dtml-in>\n
-
+INSERT INTO compatibility VALUES (\n
+ <dtml-sqlvar uid type="int">,\n
+ <dtml-sqlvar Creator type="string" optional>,\n
+ <dtml-sqlvar Date type="string" optional>,\n
+ <dtml-sqlvar PrincipiaSearchSource type="string" optional>,\n
+ <dtml-sqlvar SearchableText type="string" optional>,\n
+ <dtml-sqlvar EffectiveDate type="string" optional>,\n
+ <dtml-sqlvar ExpiresDate type="string" optional>,\n
+ <dtml-sqlvar ModificationDate type="string" optional>,\n
+ <dtml-sqlvar Type type="string" optional>,\n
+ <dtml-sqlvar bobobase_modification_time type="string" optional>,\n
+ <dtml-sqlvar created type="string" optional>,\n
+ <dtml-sqlvar effective type="string" optional>,\n
+ <dtml-sqlvar expires type="string" optional>,\n
+ <dtml-sqlvar getIcon type="string" optional>,\n
+ <dtml-sqlvar in_reply_to type="string" optional>,\n
+ <dtml-sqlvar modified type="string" optional>,\n
+ <dtml-sqlvar review_state type="string" optional>,\n
+ <dtml-sqlvar summary type="string" optional>\n
+);
]]></string> </value>
</item>
@@ -12042,51 +12390,26 @@ VALUES\n
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-INSERT INTO\n
- catalog\n
-VALUES\n
-<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
-(\n
- <dtml-sqlvar expr="uid[loop_item]" type="int">, \n
- <dtml-sqlvar expr="security_uid[loop_item]" type="int">,\n
- <dtml-sqlvar expr="getPath[loop_item]" type="string">,\n
- <dtml-sqlvar expr="getRelativeUrl[loop_item]" type="string">,\n
- <dtml-sqlvar expr="getParentUid[loop_item]" type="int">,\n
- <dtml-sqlvar expr="id[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="CreationDate[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getDescription[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getTitle[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="meta_type[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getPortalType[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="opportunity_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getDefaultSourceReference[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getDefaultDestinationReference[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getDefaultSourceTitle[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getDefaultDestinationTitle[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getDefaultSourceSectionTitle[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getDefaultDestinationSectionTitle[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getDefaultCausalityId[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getLocation[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getEan13Code[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="validation_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="simulation_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="causality_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="discussion_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="payment_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="event_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="invoice_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getOrderId[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getReference[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getSourceReference[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getDestinationReference[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getStringIndex[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getIntIndex[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getFloatIndex[loop_item]" type="float" optional>\n
-\n
-)\n
-<dtml-if sequence-end><dtml-else>,</dtml-if>\n
-</dtml-in>\n
-
+INSERT INTO compatibility VALUES (\n
+ <dtml-sqlvar uid type="int">,\n
+ <dtml-sqlvar Creator type="string" optional>,\n
+ <dtml-sqlvar Date type="string" optional>,\n
+ <dtml-sqlvar PrincipiaSearchSource type="string" optional>,\n
+ <dtml-sqlvar SearchableText type="string" optional>,\n
+ <dtml-sqlvar EffectiveDate type="string" optional>,\n
+ <dtml-sqlvar ExpiresDate type="string" optional>,\n
+ <dtml-sqlvar ModificationDate type="string" optional>,\n
+ <dtml-sqlvar Type type="string" optional>,\n
+ <dtml-sqlvar bobobase_modification_time type="string" optional>,\n
+ <dtml-sqlvar created type="string" optional>,\n
+ <dtml-sqlvar effective type="string" optional>,\n
+ <dtml-sqlvar expires type="string" optional>,\n
+ <dtml-sqlvar getIcon type="string" optional>,\n
+ <dtml-sqlvar in_reply_to type="string" optional>,\n
+ <dtml-sqlvar modified type="string" optional>,\n
+ <dtml-sqlvar review_state type="string" optional>,\n
+ <dtml-sqlvar summary type="string" optional>\n
+);
]]></string> </value>
</item>
@@ -12102,7 +12425,7 @@ VALUES\n
</dictionary>
</pickle>
</record>
- <record id="86" aka="AAAAAAAAAFY=">
+ <record id="88" aka="AAAAAAAAAFg=">
<pickle>
<tuple>
<tuple>
@@ -12142,13 +12465,141 @@ VALUES\n
<item>
<key> <string>_data</string> </key>
<value>
- <dictionary/>
+ <dictionary>
+ <item>
+ <key> <string>Creator</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>Date</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>EffectiveDate</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>ExpiresDate</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>ModificationDate</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>PrincipiaSearchSource</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>SearchableText</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>Type</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>bobobase_modification_time</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>created</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>effective</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>expires</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getIcon</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>in_reply_to</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>modified</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>review_state</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>summary</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>uid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ </dictionary>
</value>
</item>
<item>
<key> <string>_keys</string> </key>
<value>
- <list/>
+ <list>
+<string>uid</string>
+<string>Creator</string>
+<string>Date</string>
+<string>PrincipiaSearchSource</string>
+<string>SearchableText</string>
+<string>EffectiveDate</string>
+<string>ExpiresDate</string>
+<string>ModificationDate</string>
+<string>Type</string>
+<string>bobobase_modification_time</string>
+<string>created</string>
+<string>effective</string>
+<string>expires</string>
+<string>getIcon</string>
+<string>in_reply_to</string>
+<string>modified</string>
+<string>review_state</string>
+<string>summary</string>
+ </list>
</value>
</item>
</dictionary>
@@ -12164,7 +12615,25 @@ VALUES\n
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string></string> </value>
+ <value> <string>uid\r\n
+Creator\r\n
+Date\r\n
+PrincipiaSearchSource\r\n
+SearchableText\r\n
+EffectiveDate\r\n
+ExpiresDate\r\n
+ModificationDate\r\n
+Type\r\n
+bobobase_modification_time\r\n
+created\r\n
+effective\r\n
+expires\r\n
+getIcon\r\n
+in_reply_to\r\n
+modified\r\n
+review_state\r\n
+summary\r\n
+</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -12190,19 +12659,52 @@ VALUES\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_catalog_paths</string> </value>
+ <value> <string>z_catalog_compatibility_list</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
- <value> <int>0</int> </value>
+ <value> <int>100</int> </value>
</item>
<item>
<key> <string>max_rows_</string> </key>
- <value> <int>100000</int> </value>
+ <value> <int>1000</int> </value>
</item>
<item>
<key> <string>src</string> </key>
- <value> <string>select distinct path from catalog</string> </value>
+ <value> <string encoding="cdata"><![CDATA[
+
+INSERT INTO\n
+ compatibility\n
+VALUES\n
+<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
+(\n
+ <dtml-sqlvar expr="uid[loop_item]" type="int">, \n
+ <dtml-sqlvar expr="Creator[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="Date[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="PrincipiaSearchSource[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="SearchableText[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="EffectiveDate[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="ExpiresDate[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="ModificationDate[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="Type[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="bobobase_modification_time[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="created[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="effective[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="expires[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getIcon[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="in_reply_to[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="modified[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="review_state[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="summary[loop_item]" type="string" optional>\n
+)\n
+<dtml-if sequence-end>\n
+<dtml-else>\n
+,\n
+</dtml-if>\n
+</dtml-in>\n
+
+
+]]></string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -12236,7 +12738,40 @@ VALUES\n
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string>select distinct path from catalog</string> </value>
+ <value> <string encoding="cdata"><![CDATA[
+
+INSERT INTO\n
+ compatibility\n
+VALUES\n
+<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
+(\n
+ <dtml-sqlvar expr="uid[loop_item]" type="int">, \n
+ <dtml-sqlvar expr="Creator[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="Date[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="PrincipiaSearchSource[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="SearchableText[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="EffectiveDate[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="ExpiresDate[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="ModificationDate[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="Type[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="bobobase_modification_time[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="created[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="effective[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="expires[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getIcon[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="in_reply_to[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="modified[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="review_state[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="summary[loop_item]" type="string" optional>\n
+)\n
+<dtml-if sequence-end>\n
+<dtml-else>\n
+,\n
+</dtml-if>\n
+</dtml-in>\n
+
+
+]]></string> </value>
</item>
</dictionary>
</state>
@@ -12250,7 +12785,7 @@ VALUES\n
</dictionary>
</pickle>
</record>
- <record id="87" aka="AAAAAAAAAFc=">
+ <record id="89" aka="AAAAAAAAAFk=">
<pickle>
<tuple>
<tuple>
@@ -12292,13 +12827,49 @@ VALUES\n
<value>
<dictionary>
<item>
- <key> <string>optimised_roles_and_users</string> </key>
+ <key> <string>getAggregateUidList</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getDestinationSectionUid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getDestinationUid</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>security_uid</string> </key>
+ <key> <string>getResourceUid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getStopDate</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getVariationText</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>isMovement</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>uid</string> </key>
<value>
<dictionary/>
</value>
@@ -12310,8 +12881,14 @@ VALUES\n
<key> <string>_keys</string> </key>
<value>
<list>
-<string>security_uid</string>
-<string>optimised_roles_and_users</string>
+<string>isMovement</string>
+<string>uid</string>
+<string>getAggregateUidList</string>
+<string>getDestinationUid</string>
+<string>getDestinationSectionUid</string>
+<string>getResourceUid</string>
+<string>getStopDate</string>
+<string>getVariationText</string>
</list>
</value>
</item>
@@ -12320,6 +12897,18 @@ VALUES\n
</object>
</value>
</item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <tuple>
+ <list>
+ <string>nexedi</string>
+ <string>acl_users</string>
+ </list>
+ <string>jp</string>
+ </tuple>
+ </value>
+ </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -12328,8 +12917,14 @@ VALUES\n
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>security_uid\r\n
-optimised_roles_and_users</string> </value>
+ <value> <string>isMovement\r\n
+uid\r\n
+getAggregateUidList\r\n
+getDestinationUid\r\n
+getDestinationSectionUid\r\n
+getResourceUid\r\n
+getStopDate\r\n
+getVariationText</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -12355,7 +12950,7 @@ optimised_roles_and_users</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_catalog_roles_and_users</string> </value>
+ <value> <string>z_catalog_item</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -12369,15 +12964,21 @@ optimised_roles_and_users</string> </value>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-if optimised_roles_and_users>\n
-INSERT INTO roles_and_users VALUES\n
-<dtml-in optimised_roles_and_users>\n
-(<dtml-sqlvar security_uid type="int">, <dtml-sqlvar sequence-item type=string>)\n
-<dtml-if sequence-end><dtml-else>,</dtml-if>\n
-</dtml-in>\n
-;\n
+<dtml-if isMovement>\n
+<dtml-if isAccountable>\n
+<dtml-if getAggregateUidList>\n
+INSERT INTO item VALUES <dtml-in getAggregateUidList>( \n
+ <dtml-sqlvar uid type="int">,\n
+ <dtml-sqlvar getStopDate type="string" optional>,\n
+ <dtml-sqlvar getDestinationUid type="int" optional>,\n
+ <dtml-sqlvar getDestinationSectionUid type="int" optional>,\n
+ <dtml-sqlvar getResourceUid type="int" optional>,\n
+ <dtml-sqlvar sequence-item type="int" optional>,\n
+ <dtml-sqlvar getVariationText type="string" optional>\n
+)<dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>;\n
</dtml-if>\n
-
+</dtml-if>\n
+</dtml-if>
]]></string> </value>
</item>
@@ -12415,15 +13016,21 @@ INSERT INTO roles_and_users VALUES\n
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-if optimised_roles_and_users>\n
-INSERT INTO roles_and_users VALUES\n
-<dtml-in optimised_roles_and_users>\n
-(<dtml-sqlvar security_uid type="int">, <dtml-sqlvar sequence-item type=string>)\n
-<dtml-if sequence-end><dtml-else>,</dtml-if>\n
-</dtml-in>\n
-;\n
+<dtml-if isMovement>\n
+<dtml-if isAccountable>\n
+<dtml-if getAggregateUidList>\n
+INSERT INTO item VALUES <dtml-in getAggregateUidList>( \n
+ <dtml-sqlvar uid type="int">,\n
+ <dtml-sqlvar getStopDate type="string" optional>,\n
+ <dtml-sqlvar getDestinationUid type="int" optional>,\n
+ <dtml-sqlvar getDestinationSectionUid type="int" optional>,\n
+ <dtml-sqlvar getResourceUid type="int" optional>,\n
+ <dtml-sqlvar sequence-item type="int" optional>,\n
+ <dtml-sqlvar getVariationText type="string" optional>\n
+)<dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>;\n
</dtml-if>\n
-
+</dtml-if>\n
+</dtml-if>
]]></string> </value>
</item>
@@ -12439,7 +13046,7 @@ INSERT INTO roles_and_users VALUES\n
</dictionary>
</pickle>
</record>
- <record id="88" aka="AAAAAAAAAFg=">
+ <record id="90" aka="AAAAAAAAAFo=">
<pickle>
<tuple>
<tuple>
@@ -12481,13 +13088,49 @@ INSERT INTO roles_and_users VALUES\n
<value>
<dictionary>
<item>
- <key> <string>optimised_roles_and_users</string> </key>
+ <key> <string>getAggregateUidList</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>security_uid</string> </key>
+ <key> <string>getDestinationSectionUid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getDestinationUid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getResourceUid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getStopDate</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getVariationText</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>isMovement</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>uid</string> </key>
<value>
<dictionary/>
</value>
@@ -12499,8 +13142,14 @@ INSERT INTO roles_and_users VALUES\n
<key> <string>_keys</string> </key>
<value>
<list>
-<string>security_uid</string>
-<string>optimised_roles_and_users</string>
+<string>isMovement</string>
+<string>uid</string>
+<string>getStopDate</string>
+<string>getDestinationUid</string>
+<string>getDestinationSectionUid</string>
+<string>getResourceUid</string>
+<string>getVariationText</string>
+<string>getAggregateUidList</string>
</list>
</value>
</item>
@@ -12509,6 +13158,18 @@ INSERT INTO roles_and_users VALUES\n
</object>
</value>
</item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <tuple>
+ <list>
+ <string>nexedi</string>
+ <string>acl_users</string>
+ </list>
+ <string>jp</string>
+ </tuple>
+ </value>
+ </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -12517,8 +13178,14 @@ INSERT INTO roles_and_users VALUES\n
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>security_uid\r\n
-optimised_roles_and_users</string> </value>
+ <value> <string>isMovement\r\n
+uid\r\n
+getStopDate\r\n
+getDestinationUid\r\n
+getDestinationSectionUid\r\n
+getResourceUid\r\n
+getVariationText\r\n
+getAggregateUidList</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -12544,7 +13211,7 @@ optimised_roles_and_users</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_catalog_roles_and_users_list</string> </value>
+ <value> <string>z_catalog_item_list</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -12558,20 +13225,28 @@ optimised_roles_and_users</string> </value>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-let row_list="[]">\n
- <dtml-in prefix="loop" expr="_.range(_.len(security_uid))">\n
- <dtml-if expr="optimised_roles_and_users[loop_item]">\n
- <dtml-in prefix="role" expr="optimised_roles_and_users[loop_item]">\n
- <dtml-call expr="row_list.append([security_uid[loop_item], role_item])">\n
- </dtml-in>\n
+<dtml-let movement_list="[]">\n
+ <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
+ <dtml-if "isMovement[loop_item]">\n
+ <dtml-call expr="movement_list.append(loop_item)">\n
</dtml-if>\n
</dtml-in>\n
- <dtml-if expr="len(row_list) > 0">\n
+ <dtml-if expr="len(movement_list) > 0">\n
INSERT INTO\n
- roles_and_users\n
+ item\n
VALUES\n
- <dtml-in prefix="row" expr="row_list">\n
-(<dtml-sqlvar expr="row_item[0]" type="string">, <dtml-sqlvar expr="row_item[1]" type="string">)\n
+ <dtml-in prefix="loop" expr="movement_list">\n
+ <dtml-if getAggregateUidList><dtml-in getAggregateUidList>\n
+( \n
+ <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
+ <dtml-sqlvar expr="getStopDate[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getDestinationUid[loop_item]" type="int" optional>,\n
+ <dtml-sqlvar expr="getDestinationSectionUid[loop_item]" type="int" optional>,\n
+ <dtml-sqlvar expr="getResourceUid[loop_item]" type="int" optional>,\n
+ <dtml-sqlvar sequence-item type="int" optional>,\n
+ <dtml-sqlvar expr="getVariationText[loop_item]" type="string" optional>,\n
+)\n
+<dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in></dtml-if>\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>\n
</dtml-if>\n
@@ -12614,20 +13289,28 @@ VALUES\n
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-let row_list="[]">\n
- <dtml-in prefix="loop" expr="_.range(_.len(security_uid))">\n
- <dtml-if expr="optimised_roles_and_users[loop_item]">\n
- <dtml-in prefix="role" expr="optimised_roles_and_users[loop_item]">\n
- <dtml-call expr="row_list.append([security_uid[loop_item], role_item])">\n
- </dtml-in>\n
+<dtml-let movement_list="[]">\n
+ <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
+ <dtml-if "isMovement[loop_item]">\n
+ <dtml-call expr="movement_list.append(loop_item)">\n
</dtml-if>\n
</dtml-in>\n
- <dtml-if expr="len(row_list) > 0">\n
+ <dtml-if expr="len(movement_list) > 0">\n
INSERT INTO\n
- roles_and_users\n
+ item\n
VALUES\n
- <dtml-in prefix="row" expr="row_list">\n
-(<dtml-sqlvar expr="row_item[0]" type="string">, <dtml-sqlvar expr="row_item[1]" type="string">)\n
+ <dtml-in prefix="loop" expr="movement_list">\n
+ <dtml-if getAggregateUidList><dtml-in getAggregateUidList>\n
+( \n
+ <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
+ <dtml-sqlvar expr="getStopDate[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getDestinationUid[loop_item]" type="int" optional>,\n
+ <dtml-sqlvar expr="getDestinationSectionUid[loop_item]" type="int" optional>,\n
+ <dtml-sqlvar expr="getResourceUid[loop_item]" type="int" optional>,\n
+ <dtml-sqlvar sequence-item type="int" optional>,\n
+ <dtml-sqlvar expr="getVariationText[loop_item]" type="string" optional>,\n
+)\n
+<dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in></dtml-if>\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>\n
</dtml-if>\n
@@ -12648,7 +13331,7 @@ VALUES\n
</dictionary>
</pickle>
</record>
- <record id="89" aka="AAAAAAAAAFk=">
+ <record id="91" aka="AAAAAAAAAFs=">
<pickle>
<tuple>
<tuple>
@@ -12690,79 +13373,79 @@ VALUES\n
<value>
<dictionary>
<item>
- <key> <string>getDestinationPaymentUid</string> </key>
+ <key> <string>getDeliveryUid</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getDestinationSectionUid</string> </key>
+ <key> <string>getDestinationUid</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getDestinationUid</string> </key>
+ <key> <string>getNetConvertedQuantity</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getInventoriatedQuantity</string> </key>
+ <key> <string>getNetConvertedTargetQuantity</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getPortalType</string> </key>
+ <key> <string>getPrice</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getPrice</string> </key>
+ <key> <string>getResourceUid</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getResourceUid</string> </key>
+ <key> <string>getSourceUid</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getSimulationState</string> </key>
+ <key> <string>getStartDate</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getSourcePaymentUid</string> </key>
+ <key> <string>getStopDate</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getSourceSectionUid</string> </key>
+ <key> <string>getTargetStartDate</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getSourceUid</string> </key>
+ <key> <string>getTargetStopDate</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getStartDate</string> </key>
+ <key> <string>getTargetTotalPrice</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getStopDate</string> </key>
+ <key> <string>getTotalPrice</string> </key>
<value>
<dictionary/>
</value>
@@ -12773,18 +13456,36 @@ VALUES\n
<dictionary/>
</value>
</item>
+ <item>
+ <key> <string>hasCellContent</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
<item>
<key> <string>isAccountable</string> </key>
<value>
<dictionary/>
</value>
</item>
+ <item>
+ <key> <string>isDeliverable</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
<item>
<key> <string>isMovement</string> </key>
<value>
<dictionary/>
</value>
</item>
+ <item>
+ <key> <string>isOrderable</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
<item>
<key> <string>uid</string> </key>
<value>
@@ -12798,22 +13499,25 @@ VALUES\n
<key> <string>_keys</string> </key>
<value>
<list>
-<string>uid</string>
-<string>getResourceUid</string>
-<string>getInventoriatedQuantity</string>
-<string>getSourceUid</string>
-<string>getDestinationUid</string>
-<string>getSourceSectionUid</string>
-<string>getDestinationSectionUid</string>
-<string>isMovement</string>
-<string>getSourcePaymentUid</string>
-<string>getDestinationPaymentUid</string>
-<string>getSimulationState</string>
-<string>getPrice</string>
+<string>isMovement</string>
+<string>uid</string>
+<string>getDeliveryUid</string>
+<string>getSourceUid</string>
+<string>getDestinationUid</string>
+<string>getResourceUid</string>
+<string>getNetConvertedQuantity</string>
<string>getStartDate</string>
<string>getStopDate</string>
+<string>getNetConvertedTargetQuantity</string>
+<string>getTargetStartDate</string>
+<string>getTargetStopDate</string>
+<string>getPrice</string>
+<string>getTotalPrice</string>
+<string>getTargetTotalPrice</string>
+<string>hasCellContent</string>
<string>isAccountable</string>
-<string>getPortalType</string>
+<string>isOrderable</string>
+<string>isDeliverable</string>
<string>getVariationText</string>
</list>
</value>
@@ -12831,22 +13535,25 @@ VALUES\n
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>uid\r\n
-getResourceUid\r\n
-getInventoriatedQuantity\r\n
+ <value> <string>isMovement\r\n
+uid\r\n
+getDeliveryUid\r\n
getSourceUid\r\n
getDestinationUid\r\n
-getSourceSectionUid\r\n
-getDestinationSectionUid\r\n
-isMovement\r\n
-getSourcePaymentUid\r\n
-getDestinationPaymentUid\r\n
-getSimulationState\r\n
-getPrice\r\n
+getResourceUid\r\n
+getNetConvertedQuantity\r\n
getStartDate\r\n
getStopDate\r\n
+getNetConvertedTargetQuantity\r\n
+getTargetStartDate\r\n
+getTargetStopDate\r\n
+getPrice\r\n
+getTotalPrice\r\n
+getTargetTotalPrice\r\n
+hasCellContent\r\n
isAccountable\r\n
-getPortalType\r\n
+isOrderable\r\n
+isDeliverable\r\n
getVariationText</string> </value>
</item>
<item>
@@ -12873,7 +13580,7 @@ getVariationText</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_catalog_stock</string> </value>
+ <value> <string>z_catalog_movement</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -12888,69 +13595,29 @@ getVariationText</string> </value>
<value> <string encoding="cdata"><![CDATA[
<dtml-if isMovement>\n
-<dtml-if getResourceUid>\n
-<dtml-if getDestinationUid>\n
-INSERT INTO\n
- stock\n
-VALUES\n
-(\n
- <dtml-sqlvar uid type="int">,\n
- <dtml-sqlvar getDestinationUid type="int">,\n
- <dtml-if getDestinationSectionUid><dtml-sqlvar getDestinationSectionUid type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getDestinationPaymentUid><dtml-sqlvar getDestinationPaymentUid type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getSourceSectionUid><dtml-sqlvar getSourceSectionUid type="int"><dtml-else>NULL</dtml-if>, \n
- <dtml-sqlvar getResourceUid type="int">,\n
- <dtml-if getInventoriatedQuantity><dtml-sqlvar "-getInventoriatedQuantity" type="float"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getStopDate><dtml-sqlvar getStopDate type="string"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getPrice><dtml-sqlvar getPrice type="float"><dtml-else>NULL</dtml-if>,\n
- <dtml-if isAccountable><dtml-sqlvar isAccountable type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getPortalType><dtml-sqlvar getPortalType type="string"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getSimulationState><dtml-sqlvar getSimulationState type="string"><dtml-else>NULL</dtml-if>,\n
- <dtml-if "getVariationText is not None"><dtml-sqlvar getVariationText type="string"><dtml-else>NULL</dtml-if>\n
-)\n
-<dtml-if getSourceUid>\n
-,\n
-(\n
- <dtml-sqlvar uid type="int">,\n
- <dtml-sqlvar getSourceUid type="int">, \n
- <dtml-if getSourceSectionUid><dtml-sqlvar getSourceSectionUid type="int"><dtml-else>NULL</dtml-if>, \n
- <dtml-if getSourcePaymentUid><dtml-sqlvar getSourcePaymentUid type="int"><dtml-else>NULL</dtml-if>, \n
- <dtml-if getDestinationSectionUid><dtml-sqlvar getDestinationSectionUid type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-sqlvar getResourceUid type="int">, \n
- <dtml-if getInventoriatedQuantity><dtml-sqlvar "getInventoriatedQuantity" type="float"><dtml-else>NULL</dtml-if>, \n
- <dtml-if getStartDate><dtml-sqlvar getStartDate type="string"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getPrice><dtml-sqlvar getPrice type="float"><dtml-else>NULL</dtml-if>,\n
- <dtml-if isAccountable><dtml-sqlvar isAccountable type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getPortalType><dtml-sqlvar getPortalType type="string"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getSimulationState><dtml-sqlvar getSimulationState type="string"><dtml-else>NULL</dtml-if>,\n
- <dtml-if "getVariationText is not None"><dtml-sqlvar getVariationText type="string"><dtml-else>NULL</dtml-if>\n
-)\n
-</dtml-if>\n
-<dtml-else>\n
-<dtml-if getSourceUid>\n
-INSERT INTO\n
- stock\n
-VALUES\n
-(\n
+INSERT INTO movement VALUES ( \n
<dtml-sqlvar uid type="int">,\n
- <dtml-sqlvar getSourceUid type="int">, \n
- <dtml-if getSourceSectionUid><dtml-sqlvar getSourceSectionUid type="int"><dtml-else>NULL</dtml-if>, \n
- <dtml-if getSourcePaymentUid><dtml-sqlvar getSourcePaymentUid type="int"><dtml-else>NULL</dtml-if>, \n
- <dtml-if getDestinationSectionUid><dtml-sqlvar getDestinationSectionUid type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-sqlvar getResourceUid type="int">, \n
- <dtml-if getInventoriatedQuantity><dtml-sqlvar "getInventoriatedQuantity" type="float"><dtml-else>NULL</dtml-if>, \n
+ <dtml-if getDeliveryUid><dtml-sqlvar getDeliveryUid type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getSourceUid><dtml-sqlvar getSourceUid type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getDestinationUid ><dtml-sqlvar getDestinationUid type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getResourceUid><dtml-sqlvar getResourceUid type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getNetConvertedQuantity><dtml-sqlvar getNetConvertedQuantity type="float"><dtml-else>NULL</dtml-if>,\n
+ NULL,\n
<dtml-if getStartDate><dtml-sqlvar getStartDate type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getStopDate><dtml-sqlvar getStopDate type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getNetConvertedTargetQuantity><dtml-sqlvar getNetConvertedTargetQuantity type="float"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getTargetStartDate><dtml-sqlvar getTargetStartDate type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getTargetStopDate><dtml-sqlvar getTargetStopDate type="string"><dtml-else>NULL</dtml-if>,\n
<dtml-if getPrice><dtml-sqlvar getPrice type="float"><dtml-else>NULL</dtml-if>,\n
- <dtml-if isAccountable><dtml-sqlvar isAccountable type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getPortalType><dtml-sqlvar getPortalType type="string"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getSimulationState><dtml-sqlvar getSimulationState type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getTotalPrice><dtml-sqlvar getTotalPrice type="float"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getTargetTotalPrice><dtml-sqlvar getTargetTotalPrice type="float"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if "hasCellContent is not None"><dtml-sqlvar hasCellContent type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if "isAccountable is not None"><dtml-sqlvar isAccountable type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if "isOrderable is not None"><dtml-sqlvar isOrderable type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if "isDeliverable is not None"><dtml-sqlvar isDeliverable type="int"><dtml-else>NULL</dtml-if>,\n
<dtml-if "getVariationText is not None"><dtml-sqlvar getVariationText type="string"><dtml-else>NULL</dtml-if>\n
-)\n
-</dtml-if>\n
-</dtml-if>\n
-</dtml-if>\n
-</dtml-if>\n
-
+);\n
+</dtml-if>
]]></string> </value>
</item>
@@ -12989,69 +13656,29 @@ VALUES\n
<value> <string encoding="cdata"><![CDATA[
<dtml-if isMovement>\n
-<dtml-if getResourceUid>\n
-<dtml-if getDestinationUid>\n
-INSERT INTO\n
- stock\n
-VALUES\n
-(\n
- <dtml-sqlvar uid type="int">,\n
- <dtml-sqlvar getDestinationUid type="int">,\n
- <dtml-if getDestinationSectionUid><dtml-sqlvar getDestinationSectionUid type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getDestinationPaymentUid><dtml-sqlvar getDestinationPaymentUid type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getSourceSectionUid><dtml-sqlvar getSourceSectionUid type="int"><dtml-else>NULL</dtml-if>, \n
- <dtml-sqlvar getResourceUid type="int">,\n
- <dtml-if getInventoriatedQuantity><dtml-sqlvar "-getInventoriatedQuantity" type="float"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getStopDate><dtml-sqlvar getStopDate type="string"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getPrice><dtml-sqlvar getPrice type="float"><dtml-else>NULL</dtml-if>,\n
- <dtml-if isAccountable><dtml-sqlvar isAccountable type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getPortalType><dtml-sqlvar getPortalType type="string"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getSimulationState><dtml-sqlvar getSimulationState type="string"><dtml-else>NULL</dtml-if>,\n
- <dtml-if "getVariationText is not None"><dtml-sqlvar getVariationText type="string"><dtml-else>NULL</dtml-if>\n
-)\n
-<dtml-if getSourceUid>\n
-,\n
-(\n
- <dtml-sqlvar uid type="int">,\n
- <dtml-sqlvar getSourceUid type="int">, \n
- <dtml-if getSourceSectionUid><dtml-sqlvar getSourceSectionUid type="int"><dtml-else>NULL</dtml-if>, \n
- <dtml-if getSourcePaymentUid><dtml-sqlvar getSourcePaymentUid type="int"><dtml-else>NULL</dtml-if>, \n
- <dtml-if getDestinationSectionUid><dtml-sqlvar getDestinationSectionUid type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-sqlvar getResourceUid type="int">, \n
- <dtml-if getInventoriatedQuantity><dtml-sqlvar "getInventoriatedQuantity" type="float"><dtml-else>NULL</dtml-if>, \n
- <dtml-if getStartDate><dtml-sqlvar getStartDate type="string"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getPrice><dtml-sqlvar getPrice type="float"><dtml-else>NULL</dtml-if>,\n
- <dtml-if isAccountable><dtml-sqlvar isAccountable type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getPortalType><dtml-sqlvar getPortalType type="string"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getSimulationState><dtml-sqlvar getSimulationState type="string"><dtml-else>NULL</dtml-if>,\n
- <dtml-if "getVariationText is not None"><dtml-sqlvar getVariationText type="string"><dtml-else>NULL</dtml-if>\n
-)\n
-</dtml-if>\n
-<dtml-else>\n
-<dtml-if getSourceUid>\n
-INSERT INTO\n
- stock\n
-VALUES\n
-(\n
+INSERT INTO movement VALUES ( \n
<dtml-sqlvar uid type="int">,\n
- <dtml-sqlvar getSourceUid type="int">, \n
- <dtml-if getSourceSectionUid><dtml-sqlvar getSourceSectionUid type="int"><dtml-else>NULL</dtml-if>, \n
- <dtml-if getSourcePaymentUid><dtml-sqlvar getSourcePaymentUid type="int"><dtml-else>NULL</dtml-if>, \n
- <dtml-if getDestinationSectionUid><dtml-sqlvar getDestinationSectionUid type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-sqlvar getResourceUid type="int">, \n
- <dtml-if getInventoriatedQuantity><dtml-sqlvar "getInventoriatedQuantity" type="float"><dtml-else>NULL</dtml-if>, \n
+ <dtml-if getDeliveryUid><dtml-sqlvar getDeliveryUid type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getSourceUid><dtml-sqlvar getSourceUid type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getDestinationUid ><dtml-sqlvar getDestinationUid type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getResourceUid><dtml-sqlvar getResourceUid type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getNetConvertedQuantity><dtml-sqlvar getNetConvertedQuantity type="float"><dtml-else>NULL</dtml-if>,\n
+ NULL,\n
<dtml-if getStartDate><dtml-sqlvar getStartDate type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getStopDate><dtml-sqlvar getStopDate type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getNetConvertedTargetQuantity><dtml-sqlvar getNetConvertedTargetQuantity type="float"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getTargetStartDate><dtml-sqlvar getTargetStartDate type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getTargetStopDate><dtml-sqlvar getTargetStopDate type="string"><dtml-else>NULL</dtml-if>,\n
<dtml-if getPrice><dtml-sqlvar getPrice type="float"><dtml-else>NULL</dtml-if>,\n
- <dtml-if isAccountable><dtml-sqlvar isAccountable type="int"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getPortalType><dtml-sqlvar getPortalType type="string"><dtml-else>NULL</dtml-if>,\n
- <dtml-if getSimulationState><dtml-sqlvar getSimulationState type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getTotalPrice><dtml-sqlvar getTotalPrice type="float"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getTargetTotalPrice><dtml-sqlvar getTargetTotalPrice type="float"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if "hasCellContent is not None"><dtml-sqlvar hasCellContent type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if "isAccountable is not None"><dtml-sqlvar isAccountable type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if "isOrderable is not None"><dtml-sqlvar isOrderable type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if "isDeliverable is not None"><dtml-sqlvar isDeliverable type="int"><dtml-else>NULL</dtml-if>,\n
<dtml-if "getVariationText is not None"><dtml-sqlvar getVariationText type="string"><dtml-else>NULL</dtml-if>\n
-)\n
-</dtml-if>\n
-</dtml-if>\n
-</dtml-if>\n
-</dtml-if>\n
-
+);\n
+</dtml-if>
]]></string> </value>
</item>
@@ -13067,7 +13694,7 @@ VALUES\n
</dictionary>
</pickle>
</record>
- <record id="90" aka="AAAAAAAAAFo=">
+ <record id="92" aka="AAAAAAAAAFw=">
<pickle>
<tuple>
<tuple>
@@ -13109,31 +13736,37 @@ VALUES\n
<value>
<dictionary>
<item>
- <key> <string>getDestinationPaymentUid</string> </key>
+ <key> <string>getDestinationUid</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getDestinationSectionUid</string> </key>
+ <key> <string>getExplanationUid</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getDestinationUid</string> </key>
+ <key> <string>getInventoriatedStartDate</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getInventoriatedQuantity</string> </key>
+ <key> <string>getInventoriatedStopDate</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getPortalType</string> </key>
+ <key> <string>getNetConvertedQuantity</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getNetConvertedTargetQuantity</string> </key>
<value>
<dictionary/>
</value>
@@ -13151,43 +13784,43 @@ VALUES\n
</value>
</item>
<item>
- <key> <string>getSimulationState</string> </key>
+ <key> <string>getSourceUid</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getSourcePaymentUid</string> </key>
+ <key> <string>getTargetStartDate</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getSourceSectionUid</string> </key>
+ <key> <string>getTargetStopDate</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getSourceUid</string> </key>
+ <key> <string>getTargetTotalPrice</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getStartDate</string> </key>
+ <key> <string>getTotalPrice</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getStopDate</string> </key>
+ <key> <string>getVariationText</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getVariationText</string> </key>
+ <key> <string>hasCellContent</string> </key>
<value>
<dictionary/>
</value>
@@ -13198,12 +13831,24 @@ VALUES\n
<dictionary/>
</value>
</item>
+ <item>
+ <key> <string>isDeliverable</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
<item>
<key> <string>isMovement</string> </key>
<value>
<dictionary/>
</value>
</item>
+ <item>
+ <key> <string>isOrderable</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
<item>
<key> <string>uid</string> </key>
<value>
@@ -13217,22 +13862,25 @@ VALUES\n
<key> <string>_keys</string> </key>
<value>
<list>
-<string>uid</string>
-<string>getResourceUid</string>
-<string>getInventoriatedQuantity</string>
-<string>getSourceUid</string>
-<string>getDestinationUid</string>
-<string>getSourceSectionUid</string>
-<string>getDestinationSectionUid</string>
<string>isMovement</string>
-<string>getSourcePaymentUid</string>
-<string>getDestinationPaymentUid</string>
-<string>getSimulationState</string>
+<string>uid</string>
+<string>getExplanationUid</string>
+<string>getSourceUid</string>
+<string>getDestinationUid</string>
+<string>getResourceUid</string>
+<string>getNetConvertedQuantity</string>
+<string>getInventoriatedStartDate</string>
+<string>getInventoriatedStopDate</string>
+<string>getNetConvertedTargetQuantity</string>
+<string>getTargetStartDate</string>
+<string>getTargetStopDate</string>
<string>getPrice</string>
-<string>getStartDate</string>
-<string>getStopDate</string>
+<string>getTotalPrice</string>
+<string>getTargetTotalPrice</string>
+<string>hasCellContent</string>
<string>isAccountable</string>
-<string>getPortalType</string>
+<string>isOrderable</string>
+<string>isDeliverable</string>
<string>getVariationText</string>
</list>
</value>
@@ -13250,22 +13898,25 @@ VALUES\n
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>uid\r\n
-getResourceUid\r\n
-getInventoriatedQuantity\r\n
+ <value> <string>isMovement\r\n
+uid\r\n
+getExplanationUid\r\n
getSourceUid\r\n
getDestinationUid\r\n
-getSourceSectionUid\r\n
-getDestinationSectionUid\r\n
-isMovement\r\n
-getSourcePaymentUid\r\n
-getDestinationPaymentUid\r\n
-getSimulationState\r\n
+getResourceUid\r\n
+getNetConvertedQuantity\r\n
+getInventoriatedStartDate\r\n
+getInventoriatedStopDate\r\n
+getNetConvertedTargetQuantity\r\n
+getTargetStartDate\r\n
+getTargetStopDate\r\n
getPrice\r\n
-getStartDate\r\n
-getStopDate\r\n
+getTotalPrice\r\n
+getTargetTotalPrice\r\n
+hasCellContent\r\n
isAccountable\r\n
-getPortalType\r\n
+isOrderable\r\n
+isDeliverable\r\n
getVariationText</string> </value>
</item>
<item>
@@ -13292,7 +13943,7 @@ getVariationText</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_catalog_stock_list</string> </value>
+ <value> <string>z_catalog_movement_list</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -13306,39 +13957,38 @@ getVariationText</string> </value>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-let row_list="[]">\n
+<dtml-let movement_list="[]">\n
<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
<dtml-if "isMovement[loop_item]">\n
- <dtml-if "getResourceUid[loop_item]">\n
- <dtml-if "getDestinationUid[loop_item]">\n
- <dtml-call expr="row_list.append([uid[loop_item], getDestinationUid[loop_item], getDestinationSectionUid[loop_item], getDestinationPaymentUid[loop_item], getSourceSectionUid[loop_item], getResourceUid[loop_item], -getInventoriatedQuantity[loop_item], getStopDate[loop_item], getPrice[loop_item], isAccountable[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getVariationText[loop_item]])">\n
- </dtml-if>\n
- <dtml-if "getSourceUid[loop_item]">\n
- <dtml-call expr="row_list.append([uid[loop_item], getSourceUid[loop_item], getSourceSectionUid[loop_item], getSourcePaymentUidList[loop_item], getDestinationSectionUid[loop_item], getResourceUid[loop_item], getInventoriatedQuantity[loop_item], getStartDate[loop_item], getPrice[loop_item], isAccountable[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getVariationText[loop_item]])">\n
- </dtml-if>\n
- </dtml-if>\n
+ <dtml-call expr="movement_list.append(loop_item)">\n
</dtml-if>\n
- </dtml-in> \n
- \n
- <dtml-if "len(row_list) > 0">\n
+ </dtml-in>\n
+ <dtml-if expr="len(movement_list) > 0">\n
INSERT INTO\n
- stock\n
+ movement\n
VALUES\n
- <dtml-in prefix="row" expr="row_list">\n
-(\n
- <dtml-sqlvar expr="row_item[0]" type="int">,\n
- <dtml-sqlvar expr="row_item[1]" type="int">, \n
- <dtml-sqlvar expr="row_item[2]" type="int" optional>, \n
- <dtml-sqlvar expr="row_item[3]" type="int" optional>, \n
- <dtml-sqlvar expr="row_item[4]" type="int" optional>,\n
- <dtml-sqlvar expr="row_item[5]" type="int">, \n
- <dtml-sqlvar expr="row_item[6]" type="float" optional>,\n
- <dtml-sqlvar expr="row_item[7]" type="string" optional>\n
- <dtml-sqlvar expr="row_item[8]" type="float" optional>\n
- <dtml-sqlvar expr="row_item[9]" type="int" optional>\n
- <dtml-sqlvar expr="row_item[10]" type="string" optional>\n
- <dtml-sqlvar expr="row_item[11]" type="string" optional>\n
- <dtml-sqlvar expr="row_item[12]" type="string" optional>\n
+ <dtml-in prefix="loop" expr="movement_list">\n
+( \n
+ <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
+ <dtml-sqlvar expr="getExplanationUid[loop_item]" type="int" optional>,\n
+ <dtml-sqlvar expr="getSourceUid[loop_item]" type="int" optional>,\n
+ <dtml-sqlvar expr="getDestinationUid[loop_item]" type="int" optional>,\n
+ <dtml-sqlvar expr="getResourceUid[loop_item]" type="int" optional>,\n
+ <dtml-sqlvar expr="getNetConvertedQuantity[loop_item]" type="float" optional>,\n
+ NULL,\n
+ <dtml-sqlvar expr="getInventoriatedStartDate[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getInventoriatedStopDate[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getNetConvertedTargetQuantity[loop_item]" type="float" optional>,\n
+ <dtml-sqlvar expr="getTargetStartDate[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getTargetStopDate[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getPrice[loop_item]" type="float" optional>,\n
+ <dtml-sqlvar expr="getTotalPrice[loop_item]" type="float" optional>,\n
+ <dtml-sqlvar expr="getTargetTotalPrice[loop_item]" type="float" optional>,\n
+ <dtml-sqlvar expr="hasCellContent[loop_item]" type="int" optional>,\n
+ <dtml-sqlvar expr="isAccountable[loop_item]" type="int" optional>,\n
+ <dtml-sqlvar expr="isOrderable[loop_item]" type="int" optional>,\n
+ <dtml-sqlvar expr="isDeliverable[loop_item]" type="int" optional>,\n
+ <dtml-sqlvar expr="getVariationText[loop_item]" type="string" optional>\n
)\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>\n
@@ -13382,39 +14032,38 @@ VALUES\n
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-let row_list="[]">\n
+<dtml-let movement_list="[]">\n
<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
<dtml-if "isMovement[loop_item]">\n
- <dtml-if "getResourceUid[loop_item]">\n
- <dtml-if "getDestinationUid[loop_item]">\n
- <dtml-call expr="row_list.append([uid[loop_item], getDestinationUid[loop_item], getDestinationSectionUid[loop_item], getDestinationPaymentUid[loop_item], getSourceSectionUid[loop_item], getResourceUid[loop_item], -getInventoriatedQuantity[loop_item], getStopDate[loop_item], getPrice[loop_item], isAccountable[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getVariationText[loop_item]])">\n
- </dtml-if>\n
- <dtml-if "getSourceUid[loop_item]">\n
- <dtml-call expr="row_list.append([uid[loop_item], getSourceUid[loop_item], getSourceSectionUid[loop_item], getSourcePaymentUidList[loop_item], getDestinationSectionUid[loop_item], getResourceUid[loop_item], getInventoriatedQuantity[loop_item], getStartDate[loop_item], getPrice[loop_item], isAccountable[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getVariationText[loop_item]])">\n
- </dtml-if>\n
- </dtml-if>\n
+ <dtml-call expr="movement_list.append(loop_item)">\n
</dtml-if>\n
- </dtml-in> \n
- \n
- <dtml-if "len(row_list) > 0">\n
+ </dtml-in>\n
+ <dtml-if expr="len(movement_list) > 0">\n
INSERT INTO\n
- stock\n
+ movement\n
VALUES\n
- <dtml-in prefix="row" expr="row_list">\n
-(\n
- <dtml-sqlvar expr="row_item[0]" type="int">,\n
- <dtml-sqlvar expr="row_item[1]" type="int">, \n
- <dtml-sqlvar expr="row_item[2]" type="int" optional>, \n
- <dtml-sqlvar expr="row_item[3]" type="int" optional>, \n
- <dtml-sqlvar expr="row_item[4]" type="int" optional>,\n
- <dtml-sqlvar expr="row_item[5]" type="int">, \n
- <dtml-sqlvar expr="row_item[6]" type="float" optional>,\n
- <dtml-sqlvar expr="row_item[7]" type="string" optional>\n
- <dtml-sqlvar expr="row_item[8]" type="float" optional>\n
- <dtml-sqlvar expr="row_item[9]" type="int" optional>\n
- <dtml-sqlvar expr="row_item[10]" type="string" optional>\n
- <dtml-sqlvar expr="row_item[11]" type="string" optional>\n
- <dtml-sqlvar expr="row_item[12]" type="string" optional>\n
+ <dtml-in prefix="loop" expr="movement_list">\n
+( \n
+ <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
+ <dtml-sqlvar expr="getExplanationUid[loop_item]" type="int" optional>,\n
+ <dtml-sqlvar expr="getSourceUid[loop_item]" type="int" optional>,\n
+ <dtml-sqlvar expr="getDestinationUid[loop_item]" type="int" optional>,\n
+ <dtml-sqlvar expr="getResourceUid[loop_item]" type="int" optional>,\n
+ <dtml-sqlvar expr="getNetConvertedQuantity[loop_item]" type="float" optional>,\n
+ NULL,\n
+ <dtml-sqlvar expr="getInventoriatedStartDate[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getInventoriatedStopDate[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getNetConvertedTargetQuantity[loop_item]" type="float" optional>,\n
+ <dtml-sqlvar expr="getTargetStartDate[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getTargetStopDate[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getPrice[loop_item]" type="float" optional>,\n
+ <dtml-sqlvar expr="getTotalPrice[loop_item]" type="float" optional>,\n
+ <dtml-sqlvar expr="getTargetTotalPrice[loop_item]" type="float" optional>,\n
+ <dtml-sqlvar expr="hasCellContent[loop_item]" type="int" optional>,\n
+ <dtml-sqlvar expr="isAccountable[loop_item]" type="int" optional>,\n
+ <dtml-sqlvar expr="isOrderable[loop_item]" type="int" optional>,\n
+ <dtml-sqlvar expr="isDeliverable[loop_item]" type="int" optional>,\n
+ <dtml-sqlvar expr="getVariationText[loop_item]" type="string" optional>\n
)\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>\n
@@ -13436,7 +14085,7 @@ VALUES\n
</dictionary>
</pickle>
</record>
- <record id="91" aka="AAAAAAAAAFs=">
+ <record id="93" aka="AAAAAAAAAF0=">
<pickle>
<tuple>
<tuple>
@@ -13478,7 +14127,199 @@ VALUES\n
<value>
<dictionary>
<item>
- <key> <string>Subject</string> </key>
+ <key> <string>CreationDate</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>causality_state</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>discussion_state</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>event_state</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getDefaultCausalityId</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getDefaultDestinationReference</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getDefaultDestinationSectionTitle</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getDefaultDestinationTitle</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getDefaultSourceReference</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getDefaultSourceSectionTitle</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getDefaultSourceTitle</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getDescription</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getDestinationReference</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getEan13Code</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getFloatIndex</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getIntIndex</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getLocation</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getOrderId</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getParentUid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getPath</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getPortalType</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getReference</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getRelativeUrl</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getSourceReference</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getStringIndex</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getTitle</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>invoice_state</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>meta_type</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>opportunity_state</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>payment_state</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>security_uid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>simulation_state</string> </key>
<value>
<dictionary/>
</value>
@@ -13489,6 +14330,12 @@ VALUES\n
<dictionary/>
</value>
</item>
+ <item>
+ <key> <string>validation_state</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
</dictionary>
</value>
</item>
@@ -13497,7 +14344,40 @@ VALUES\n
<value>
<list>
<string>uid</string>
-<string>Subject</string>
+<string>security_uid</string>
+<string>getPath</string>
+<string>getRelativeUrl</string>
+<string>getParentUid</string>
+<string>id</string>
+<string>CreationDate</string>
+<string>getDescription</string>
+<string>getTitle</string>
+<string>meta_type</string>
+<string>getPortalType</string>
+<string>opportunity_state</string>
+<string>getDefaultSourceReference</string>
+<string>getDefaultDestinationReference</string>
+<string>getDefaultSourceTitle</string>
+<string>getDefaultDestinationTitle</string>
+<string>getDefaultSourceSectionTitle</string>
+<string>getDefaultDestinationSectionTitle</string>
+<string>getDefaultCausalityId</string>
+<string>getLocation</string>
+<string>getEan13Code</string>
+<string>simulation_state</string>
+<string>causality_state</string>
+<string>discussion_state</string>
+<string>invoice_state</string>
+<string>getOrderId</string>
+<string>validation_state</string>
+<string>payment_state</string>
+<string>event_state</string>
+<string>getReference</string>
+<string>getSourceReference</string>
+<string>getDestinationReference</string>
+<string>getStringIndex</string>
+<string>getIntIndex</string>
+<string>getFloatIndex</string>
</list>
</value>
</item>
@@ -13514,8 +14394,41 @@ VALUES\n
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>uid\n
-Subject</string> </value>
+ <value> <string>uid\r\n
+security_uid\r\n
+getPath\r\n
+getRelativeUrl\r\n
+getParentUid\r\n
+id\r\n
+CreationDate\r\n
+getDescription\r\n
+getTitle\r\n
+meta_type\r\n
+getPortalType\r\n
+opportunity_state\r\n
+getDefaultSourceReference\r\n
+getDefaultDestinationReference\r\n
+getDefaultSourceTitle\r\n
+getDefaultDestinationTitle\r\n
+getDefaultSourceSectionTitle\r\n
+getDefaultDestinationSectionTitle\r\n
+getDefaultCausalityId\r\n
+getLocation\r\n
+getEan13Code\r\n
+simulation_state\r\n
+causality_state\r\n
+discussion_state\r\n
+invoice_state\r\n
+getOrderId\r\n
+validation_state\r\n
+payment_state\r\n
+event_state\r\n
+getReference\r\n
+getSourceReference\r\n
+getDestinationReference\n
+getStringIndex\n
+getIntIndex\n
+getFloatIndex</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -13541,7 +14454,7 @@ Subject</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_catalog_subject</string> </value>
+ <value> <string>z_catalog_object_list</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -13555,22 +14468,50 @@ Subject</string> </value>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-if Subject>\n
-INSERT INTO subject VALUES \n
-<dtml-try>\n
-<dtml-in "Subject.split()">\n
-(<dtml-sqlvar uid type="int">, <dtml-sqlvar sequence-item\n
-type=string>)<dtml-if sequence-end><dtml-else>,</dtml-if>\n
-</dtml-in> \n
-;\n
-<dtml-except>\n
-<dtml-in Subject>\n
-(<dtml-sqlvar uid type="int">, <dtml-sqlvar sequence-item\n
-type=string>)<dtml-if sequence-end><dtml-else>,</dtml-if>\n
-</dtml-in> \n
-;\n
-</dtml-try>\n
-</dtml-if>\n
+INSERT INTO\n
+ catalog\n
+VALUES\n
+<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
+(\n
+ <dtml-sqlvar expr="uid[loop_item]" type="int">, \n
+ <dtml-sqlvar expr="security_uid[loop_item]" type="int">,\n
+ <dtml-sqlvar expr="getPath[loop_item]" type="string">,\n
+ <dtml-sqlvar expr="getRelativeUrl[loop_item]" type="string">,\n
+ <dtml-sqlvar expr="getParentUid[loop_item]" type="int">,\n
+ <dtml-sqlvar expr="id[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="CreationDate[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getDescription[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getTitle[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="meta_type[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getPortalType[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="opportunity_state[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getDefaultSourceReference[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getDefaultDestinationReference[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getDefaultSourceTitle[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getDefaultDestinationTitle[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getDefaultSourceSectionTitle[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getDefaultDestinationSectionTitle[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getDefaultCausalityId[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getLocation[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getEan13Code[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="validation_state[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="simulation_state[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="causality_state[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="discussion_state[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="payment_state[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="event_state[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="invoice_state[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getOrderId[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getReference[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getSourceReference[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getDestinationReference[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getStringIndex[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getIntIndex[loop_item]" type="int" optional>,\n
+ <dtml-sqlvar expr="getFloatIndex[loop_item]" type="float" optional>\n
+\n
+)\n
+<dtml-if sequence-end><dtml-else>,</dtml-if>\n
+</dtml-in>\n
]]></string> </value>
@@ -13605,26 +14546,54 @@ type=string>)<dtml-if sequence-end><dtml-else>,</dtml-if>\n
<dictionary/>
</value>
</item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-if Subject>\n
-INSERT INTO subject VALUES \n
-<dtml-try>\n
-<dtml-in "Subject.split()">\n
-(<dtml-sqlvar uid type="int">, <dtml-sqlvar sequence-item\n
-type=string>)<dtml-if sequence-end><dtml-else>,</dtml-if>\n
-</dtml-in> \n
-;\n
-<dtml-except>\n
-<dtml-in Subject>\n
-(<dtml-sqlvar uid type="int">, <dtml-sqlvar sequence-item\n
-type=string>)<dtml-if sequence-end><dtml-else>,</dtml-if>\n
-</dtml-in> \n
-;\n
-</dtml-try>\n
-</dtml-if>\n
+ <item>
+ <key> <string>raw</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+INSERT INTO\n
+ catalog\n
+VALUES\n
+<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
+(\n
+ <dtml-sqlvar expr="uid[loop_item]" type="int">, \n
+ <dtml-sqlvar expr="security_uid[loop_item]" type="int">,\n
+ <dtml-sqlvar expr="getPath[loop_item]" type="string">,\n
+ <dtml-sqlvar expr="getRelativeUrl[loop_item]" type="string">,\n
+ <dtml-sqlvar expr="getParentUid[loop_item]" type="int">,\n
+ <dtml-sqlvar expr="id[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="CreationDate[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getDescription[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getTitle[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="meta_type[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getPortalType[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="opportunity_state[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getDefaultSourceReference[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getDefaultDestinationReference[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getDefaultSourceTitle[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getDefaultDestinationTitle[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getDefaultSourceSectionTitle[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getDefaultDestinationSectionTitle[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getDefaultCausalityId[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getLocation[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getEan13Code[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="validation_state[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="simulation_state[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="causality_state[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="discussion_state[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="payment_state[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="event_state[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="invoice_state[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getOrderId[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getReference[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getSourceReference[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getDestinationReference[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getStringIndex[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getIntIndex[loop_item]" type="int" optional>,\n
+ <dtml-sqlvar expr="getFloatIndex[loop_item]" type="float" optional>\n
+\n
+)\n
+<dtml-if sequence-end><dtml-else>,</dtml-if>\n
+</dtml-in>\n
]]></string> </value>
@@ -13641,7 +14610,7 @@ type=string>)<dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dictionary>
</pickle>
</record>
- <record id="92" aka="AAAAAAAAAFw=">
+ <record id="94" aka="AAAAAAAAAF4=">
<pickle>
<tuple>
<tuple>
@@ -13658,7 +14627,7 @@ type=string>)<dtml-if sequence-end><dtml-else>,</dtml-if>\n
<value>
<dictionary>
<item>
- <key> <string>alex</string> </key>
+ <key> <string>yo</string> </key>
<value>
<list>
<string>Owner</string>
@@ -13683,7 +14652,13 @@ type=string>)<dtml-if sequence-end><dtml-else>,</dtml-if>\n
<value>
<dictionary>
<item>
- <key> <string>Subject</string> </key>
+ <key> <string>isPredicate</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>predicate_property_dict</string> </key>
<value>
<dictionary/>
</value>
@@ -13701,8 +14676,9 @@ type=string>)<dtml-if sequence-end><dtml-else>,</dtml-if>\n
<key> <string>_keys</string> </key>
<value>
<list>
-<string>Subject</string>
<string>uid</string>
+<string>isPredicate</string>
+<string>predicate_property_dict</string>
</list>
</value>
</item>
@@ -13712,33 +14688,22 @@ type=string>)<dtml-if sequence-end><dtml-else>,</dtml-if>\n
</value>
</item>
<item>
- <key> <string>allow_simple_one_argument_traversal</string> </key>
+ <key> <string>_owner</string> </key>
<value>
- <none/>
+ <tuple>
+ <list>
+ <string>nexedi</string>
+ <string>acl_users</string>
+ </list>
+<string>yo</string>
+ </tuple>
</value>
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>Subject\r\n
-uid</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>
+ <value> <string>uid\r\n
+isPredicate\r\n
+predicate_property_dict</string> </value>
</item>
<item>
<key> <string>connection_id</string> </key>
@@ -13746,34 +14711,20 @@ uid</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_catalog_subject_list</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>
+ <value> <string>z_catalog_predicate</string> </value>
</item>
<item>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-INSERT INTO subject VALUES \n
-<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
- <dtml-if sequence-start><dtml-else>,</dtml-if>\n
- <dtml-let subject="Subject[loop_item]">\n
- <dtml-if subject>\n
- <dtml-in prefix="word" expr="subject.split()">\n
-<dtml-if sequence-start><dtml-else>,</dtml-if>\n
-(<dtml-sqlvar "uid[loop_item]" type="int">, <dtml-sqlvar word_item type="string">)\n
- </dtml-in>\n
- <dtml-else>\n
-(<dtml-sqlvar "uid[loop_item]" type="int">, NULL)\n
- </dtml-if>\n
- </dtml-let>\n
-</dtml-in>\n
+<dtml-if isPredicate>\n
+INSERT INTO predicate VALUES (\n
+ <dtml-sqlvar uid type="int">,\n
+ <dtml-if expr="predicate_property_dict.has_key(\'quantity\')"><dtml-sqlvar expr="predicate_property_dict[\'quantity\']" type="float"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if expr="predicate_property_dict.has_key(\'quantity_min\')"><dtml-sqlvar expr="predicate_property_dict[\'quantity_min\']" type="float"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if expr="predicate_property_dict.has_key(\'quantity_max\')"><dtml-sqlvar expr="predicate_property_dict[\'quantity_max\']" type="float"><dtml-else>NULL</dtml-if>\n
+ );\n
+</dtml-if>\n
]]></string> </value>
@@ -13812,20 +14763,14 @@ INSERT INTO subject VALUES \n
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-INSERT INTO subject VALUES \n
-<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
- <dtml-if sequence-start><dtml-else>,</dtml-if>\n
- <dtml-let subject="Subject[loop_item]">\n
- <dtml-if subject>\n
- <dtml-in prefix="word" expr="subject.split()">\n
-<dtml-if sequence-start><dtml-else>,</dtml-if>\n
-(<dtml-sqlvar "uid[loop_item]" type="int">, <dtml-sqlvar word_item type="string">)\n
- </dtml-in>\n
- <dtml-else>\n
-(<dtml-sqlvar "uid[loop_item]" type="int">, NULL)\n
- </dtml-if>\n
- </dtml-let>\n
-</dtml-in>\n
+<dtml-if isPredicate>\n
+INSERT INTO predicate VALUES (\n
+ <dtml-sqlvar uid type="int">,\n
+ <dtml-if expr="predicate_property_dict.has_key(\'quantity\')"><dtml-sqlvar expr="predicate_property_dict[\'quantity\']" type="float"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if expr="predicate_property_dict.has_key(\'quantity_min\')"><dtml-sqlvar expr="predicate_property_dict[\'quantity_min\']" type="float"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if expr="predicate_property_dict.has_key(\'quantity_max\')"><dtml-sqlvar expr="predicate_property_dict[\'quantity_max\']" type="float"><dtml-else>NULL</dtml-if>\n
+ );\n
+</dtml-if>\n
]]></string> </value>
@@ -13842,7 +14787,7 @@ INSERT INTO subject VALUES \n
</dictionary>
</pickle>
</record>
- <record id="93" aka="AAAAAAAAAF0=">
+ <record id="95" aka="AAAAAAAAAF8=">
<pickle>
<tuple>
<tuple>
@@ -13859,7 +14804,7 @@ INSERT INTO subject VALUES \n
<value>
<dictionary>
<item>
- <key> <string>alex</string> </key>
+ <key> <string>yo</string> </key>
<value>
<list>
<string>Owner</string>
@@ -13884,24 +14829,19 @@ INSERT INTO subject VALUES \n
<value>
<dictionary>
<item>
- <key> <string>count</string> </key>
+ <key> <string>getMembershipCriterionCategoryList</string> </key>
<value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>int</string> </value>
- </item>
- </dictionary>
+ <dictionary/>
</value>
</item>
<item>
- <key> <string>date</string> </key>
+ <key> <string>isPredicate</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>thread_id</string> </key>
+ <key> <string>uid</string> </key>
<value>
<dictionary/>
</value>
@@ -13913,9 +14853,9 @@ INSERT INTO subject VALUES \n
<key> <string>_keys</string> </key>
<value>
<list>
-<string>count</string>
-<string>thread_id</string>
-<string>date</string>
+<string>uid</string>
+<string>getMembershipCriterionCategoryList</string>
+<string>isPredicate</string>
</list>
</value>
</item>
@@ -13925,34 +14865,22 @@ INSERT INTO subject VALUES \n
</value>
</item>
<item>
- <key> <string>allow_simple_one_argument_traversal</string> </key>
+ <key> <string>_owner</string> </key>
<value>
- <none/>
+ <tuple>
+ <list>
+ <string>nexedi</string>
+ <string>acl_users</string>
+ </list>
+<string>yo</string>
+ </tuple>
</value>
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>count:int\n
-thread_id\n
-date</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>
+ <value> <string>uid\r\n
+getMembershipCriterionCategoryList\r\n
+isPredicate</string> </value>
</item>
<item>
<key> <string>connection_id</string> </key>
@@ -13960,23 +14888,33 @@ date</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_clear_reserved</string> </value>
- </item>
- <item>
- <key> <string>max_cache_</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>max_rows_</string> </key>
- <value> <int>1</int> </value>
+ <value> <string>z_catalog_predicate_category</string> </value>
</item>
<item>
<key> <string>src</string> </key>
- <value> <string>DELETE FROM\n
- catalog\n
-WHERE\n
- path = "reserved"\n
-</string> </value>
+ <value> <string encoding="cdata"><![CDATA[
+
+<dtml-if isPredicate>\n
+<dtml-if getMembershipCriterionCategoryList>\n
+<dtml-let uid_list="portal_categories.getCategoryParentUidList(getMembershipCriterionCategoryList)">\n
+<dtml-if uid_list>\n
+INSERT INTO predicate_category VALUES\n
+<dtml-in "uid_list">\n
+(<dtml-sqlvar uid type="int">, <dtml-var "_[\'sequence-item\'][0]" >, <dtml-var "_[\'sequence-item\'][1]" >, <dtml-var "_[\'sequence-item\'][2]" >)\n
+<dtml-if sequence-end><dtml-else>,</dtml-if>\n
+</dtml-in>\n
+;\n
+<dtml-else>\n
+INSERT INTO predicate_category VALUES (<dtml-sqlvar uid type="int">, NULL, NULL, 1);\n
+</dtml-if>\n
+</dtml-let>\n
+<dtml-else>\n
+INSERT INTO predicate_category VALUES (<dtml-sqlvar uid type="int">, NULL, NULL, 1);\n
+</dtml-if>\n
+</dtml-if>\n
+
+
+]]></string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -14010,11 +14948,29 @@ WHERE\n
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string>DELETE FROM\n
- catalog\n
-WHERE\n
- path = "reserved"\n
-</string> </value>
+ <value> <string encoding="cdata"><![CDATA[
+
+<dtml-if isPredicate>\n
+<dtml-if getMembershipCriterionCategoryList>\n
+<dtml-let uid_list="portal_categories.getCategoryParentUidList(getMembershipCriterionCategoryList)">\n
+<dtml-if uid_list>\n
+INSERT INTO predicate_category VALUES\n
+<dtml-in "uid_list">\n
+(<dtml-sqlvar uid type="int">, <dtml-var "_[\'sequence-item\'][0]" >, <dtml-var "_[\'sequence-item\'][1]" >, <dtml-var "_[\'sequence-item\'][2]" >)\n
+<dtml-if sequence-end><dtml-else>,</dtml-if>\n
+</dtml-in>\n
+;\n
+<dtml-else>\n
+INSERT INTO predicate_category VALUES (<dtml-sqlvar uid type="int">, NULL, NULL, 1);\n
+</dtml-if>\n
+</dtml-let>\n
+<dtml-else>\n
+INSERT INTO predicate_category VALUES (<dtml-sqlvar uid type="int">, NULL, NULL, 1);\n
+</dtml-if>\n
+</dtml-if>\n
+
+
+]]></string> </value>
</item>
</dictionary>
</state>
@@ -14023,12 +14979,12 @@ WHERE\n
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Clear Reserved Uids</string> </value>
+ <value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
- <record id="94" aka="AAAAAAAAAF4=">
+ <record id="96" aka="AAAAAAAAAGA=">
<pickle>
<tuple>
<tuple>
@@ -14070,31 +15026,13 @@ WHERE\n
<value>
<dictionary>
<item>
- <key> <string>from_table_list</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>select_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>selection_domain</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>selection_report</string> </key>
+ <key> <string>optimised_roles_and_users</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>where_expression</string> </key>
+ <key> <string>security_uid</string> </key>
<value>
<dictionary/>
</value>
@@ -14106,11 +15044,8 @@ WHERE\n
<key> <string>_keys</string> </key>
<value>
<list>
-<string>from_table_list</string>
-<string>where_expression</string>
-<string>select_expression</string>
-<string>selection_domain</string>
-<string>selection_report</string>
+<string>security_uid</string>
+<string>optimised_roles_and_users</string>
</list>
</value>
</item>
@@ -14127,23 +15062,20 @@ WHERE\n
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>from_table_list\n
-where_expression\n
-select_expression\n
-selection_domain\n
-selection_report</string> </value>
+ <value> <string>security_uid\r\n
+optimised_roles_and_users</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
- <value> <int>180</int> </value>
+ <value> <int>0</int> </value>
</item>
<item>
<key> <string>class_file_</string> </key>
- <value> <string>zsqlbrain.py</string> </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>class_name_</string> </key>
- <value> <string>ZSQLBrain</string> </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>connection_hook</string> </key>
@@ -14157,43 +15089,27 @@ selection_report</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_count_results</string> </value>
+ <value> <string>z_catalog_roles_and_users</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
- <value> <int>1000</int> </value>
+ <value> <int>100</int> </value>
</item>
<item>
<key> <string>max_rows_</string> </key>
- <value> <int>1</int> </value>
+ <value> <int>1000</int> </value>
</item>
<item>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-SELECT\n
- COUNT(DISTINCT catalog.uid) <dtml-comment>We need subselect for better statistics</dtml-comment>\n
-<dtml-if select_expression>\n
- , <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 selection_domain>, <dtml-var "selection_domain.asSqlJoinExpression()"> </dtml-if>\n
- <dtml-if selection_report>, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if>\n
-WHERE\n
- 1 = 1\n
-<dtml-if where_expression>\n
- AND <dtml-var where_expression>\n
-</dtml-if>\n
-<dtml-if selection_domain>\n
- AND <dtml-var "selection_domain.asSqlExpression()">\n
-</dtml-if>\n
-<dtml-if selection_report>\n
- AND <dtml-var "selection_report.asSqlExpression(strict_membership=1)">\n
-</dtml-if>\n
-<dtml-if sort_on>\n
-ORDER BY\n
- <dtml-var sort_on>\n
+<dtml-if optimised_roles_and_users>\n
+INSERT INTO roles_and_users VALUES\n
+<dtml-in optimised_roles_and_users>\n
+(<dtml-sqlvar security_uid type="int">, <dtml-sqlvar sequence-item type=string>)\n
+<dtml-if sequence-end><dtml-else>,</dtml-if>\n
+</dtml-in>\n
+;\n
</dtml-if>\n
@@ -14233,29 +15149,13 @@ ORDER BY\n
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-SELECT\n
- COUNT(DISTINCT catalog.uid) <dtml-comment>We need subselect for better statistics</dtml-comment>\n
-<dtml-if select_expression>\n
- , <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 selection_domain>, <dtml-var "selection_domain.asSqlJoinExpression()"> </dtml-if>\n
- <dtml-if selection_report>, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if>\n
-WHERE\n
- 1 = 1\n
-<dtml-if where_expression>\n
- AND <dtml-var where_expression>\n
-</dtml-if>\n
-<dtml-if selection_domain>\n
- AND <dtml-var "selection_domain.asSqlExpression()">\n
-</dtml-if>\n
-<dtml-if selection_report>\n
- AND <dtml-var "selection_report.asSqlExpression(strict_membership=1)">\n
-</dtml-if>\n
-<dtml-if sort_on>\n
-ORDER BY\n
- <dtml-var sort_on>\n
+<dtml-if optimised_roles_and_users>\n
+INSERT INTO roles_and_users VALUES\n
+<dtml-in optimised_roles_and_users>\n
+(<dtml-sqlvar security_uid type="int">, <dtml-sqlvar sequence-item type=string>)\n
+<dtml-if sequence-end><dtml-else>,</dtml-if>\n
+</dtml-in>\n
+;\n
</dtml-if>\n
@@ -14273,7 +15173,7 @@ ORDER BY\n
</dictionary>
</pickle>
</record>
- <record id="95" aka="AAAAAAAAAF8=">
+ <record id="97" aka="AAAAAAAAAGE=">
<pickle>
<tuple>
<tuple>
@@ -14313,13 +15213,29 @@ ORDER BY\n
<item>
<key> <string>_data</string> </key>
<value>
- <dictionary/>
+ <dictionary>
+ <item>
+ <key> <string>optimised_roles_and_users</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>security_uid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ </dictionary>
</value>
</item>
<item>
<key> <string>_keys</string> </key>
<value>
- <list/>
+ <list>
+<string>security_uid</string>
+<string>optimised_roles_and_users</string>
+ </list>
</value>
</item>
</dictionary>
@@ -14335,7 +15251,8 @@ ORDER BY\n
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string></string> </value>
+ <value> <string>security_uid\r\n
+optimised_roles_and_users</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -14361,7 +15278,7 @@ ORDER BY\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_create_catalog</string> </value>
+ <value> <string>z_catalog_roles_and_users_list</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -14373,157 +15290,85 @@ ORDER BY\n
</item>
<item>
<key> <string>src</string> </key>
- <value> <string># Host:\n
-# Database: test\n
-# Table: \'catalog\'\n
-#\n
-CREATE TABLE `catalog` (\n
- `uid` int(11) NOT NULL AUTO_INCREMENT,\n
- `security_uid` INT UNSIGNED,\n
- `path` varchar(255) NOT NULL default \'\',\n
- `relative_url` varchar(255) NOT NULL default \'\',\n
- `parent_uid` int(11) default \'0\',\n
- `id` varchar(30) default \'\',\n
- `CreationDate` datetime default \'0000-00-00 00:00:00\',\n
- `description` text,\n
- `title` varchar(255) default \'\',\n
- `meta_type` varchar(255) default \'\',\n
- `portal_type` varchar(255) default \'\',\n
- `opportunity_state` varchar(30) default \'\',\n
- `default_source_reference` varchar(30) default \'\',\n
- `default_destination_reference` varchar(30) default \'\',\n
- `default_source_title` varchar(30) default \'\',\n
- `default_destination_title` varchar(30) default \'\',\n
- `default_source_section_title` varchar(30) default \'\',\n
- `default_destination_section_title` varchar(30) default \'\',\n
- `default_causality_id` varchar(30) default \'\',\n
- `location` varchar(30),\n
- `ean13_code` varchar(30),\n
- `validation_state` varchar(30) default \'\',\n
- `simulation_state` varchar(30) default \'\',\n
- `causality_state` varchar(30) default \'\',\n
- `discussion_state` varchar(30) default \'\',\n
- `invoice_state` varchar(30) default \'\',\n
- `payment_state` varchar(30) default \'\',\n
- `event_state` varchar(30) default \'\',\n
- `order_id` varchar(30) default \'\',\n
- `reference` varchar(30) default \'\',\n
- `source_reference` varchar(30) default \'\',\n
- `destination_reference` varchar(30) default \'\',\n
- `string_index` varchar(30),\n
- `int_index` int(11),\n
- `float_index` real,\n
- PRIMARY KEY (`uid`),\n
- KEY `security_uid` (`security_uid`),\n
- KEY `Parent` (`parent_uid`),\n
- KEY `Path` (`path`),\n
- KEY `relative_url` (`relative_url`),\n
- KEY `Type` (`meta_type`,`portal_type`),\n
- KEY `Type1` (`portal_type`),\n
- KEY `Type2` (`meta_type`),\n
- KEY `opportunity_state` (`opportunity_state`),\n
- KEY `validation_state` (`validation_state`),\n
- KEY `simulation_state` (`simulation_state`),\n
- KEY `causality_state` (`causality_state`),\n
- KEY `discussion_state` (`discussion_state`),\n
- KEY `invoice_state` (`invoice_state`),\n
- KEY `order_id` (`order_id`),\n
- KEY `payment_state` (`payment_state`),\n
- KEY `event_state` (`event_state`)\n
-) TYPE=InnoDB;\n
-</string> </value>
- </item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </klass>
- <none/>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
+ <value> <string encoding="cdata"><![CDATA[
-]]></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># Host:\n
-# Database: test\n
-# Table: \'catalog\'\n
-#\n
-CREATE TABLE `catalog` (\n
- `uid` int(11) NOT NULL AUTO_INCREMENT,\n
- `security_uid` INT UNSIGNED,\n
- `path` varchar(255) NOT NULL default \'\',\n
- `relative_url` varchar(255) NOT NULL default \'\',\n
- `parent_uid` int(11) default \'0\',\n
- `id` varchar(30) default \'\',\n
- `CreationDate` datetime default \'0000-00-00 00:00:00\',\n
- `description` text,\n
- `title` varchar(255) default \'\',\n
- `meta_type` varchar(255) default \'\',\n
- `portal_type` varchar(255) default \'\',\n
- `opportunity_state` varchar(30) default \'\',\n
- `default_source_reference` varchar(30) default \'\',\n
- `default_destination_reference` varchar(30) default \'\',\n
- `default_source_title` varchar(30) default \'\',\n
- `default_destination_title` varchar(30) default \'\',\n
- `default_source_section_title` varchar(30) default \'\',\n
- `default_destination_section_title` varchar(30) default \'\',\n
- `default_causality_id` varchar(30) default \'\',\n
- `location` varchar(30),\n
- `ean13_code` varchar(30),\n
- `validation_state` varchar(30) default \'\',\n
- `simulation_state` varchar(30) default \'\',\n
- `causality_state` varchar(30) default \'\',\n
- `discussion_state` varchar(30) default \'\',\n
- `invoice_state` varchar(30) default \'\',\n
- `payment_state` varchar(30) default \'\',\n
- `event_state` varchar(30) default \'\',\n
- `order_id` varchar(30) default \'\',\n
- `reference` varchar(30) default \'\',\n
- `source_reference` varchar(30) default \'\',\n
- `destination_reference` varchar(30) default \'\',\n
- `string_index` varchar(30),\n
- `int_index` int(11),\n
- `float_index` real,\n
- PRIMARY KEY (`uid`),\n
- KEY `security_uid` (`security_uid`),\n
- KEY `Parent` (`parent_uid`),\n
- KEY `Path` (`path`),\n
- KEY `relative_url` (`relative_url`),\n
- KEY `Type` (`meta_type`,`portal_type`),\n
- KEY `Type1` (`portal_type`),\n
- KEY `Type2` (`meta_type`),\n
- KEY `opportunity_state` (`opportunity_state`),\n
- KEY `validation_state` (`validation_state`),\n
- KEY `simulation_state` (`simulation_state`),\n
- KEY `causality_state` (`causality_state`),\n
- KEY `discussion_state` (`discussion_state`),\n
- KEY `invoice_state` (`invoice_state`),\n
- KEY `order_id` (`order_id`),\n
- KEY `payment_state` (`payment_state`),\n
- KEY `event_state` (`event_state`)\n
-) TYPE=InnoDB;\n
-</string> </value>
+<dtml-let row_list="[]">\n
+ <dtml-in prefix="loop" expr="_.range(_.len(security_uid))">\n
+ <dtml-if expr="optimised_roles_and_users[loop_item]">\n
+ <dtml-in prefix="role" expr="optimised_roles_and_users[loop_item]">\n
+ <dtml-call expr="row_list.append([security_uid[loop_item], role_item])">\n
+ </dtml-in>\n
+ </dtml-if>\n
+ </dtml-in>\n
+ <dtml-if expr="len(row_list) > 0">\n
+INSERT INTO\n
+ roles_and_users\n
+VALUES\n
+ <dtml-in prefix="row" expr="row_list">\n
+(<dtml-sqlvar expr="row_item[0]" type="string">, <dtml-sqlvar expr="row_item[1]" type="string">)\n
+<dtml-if sequence-end><dtml-else>,</dtml-if>\n
+ </dtml-in>\n
+ </dtml-if>\n
+</dtml-let>\n
+
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>template</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+ </klass>
+ <none/>
+ <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-let row_list="[]">\n
+ <dtml-in prefix="loop" expr="_.range(_.len(security_uid))">\n
+ <dtml-if expr="optimised_roles_and_users[loop_item]">\n
+ <dtml-in prefix="role" expr="optimised_roles_and_users[loop_item]">\n
+ <dtml-call expr="row_list.append([security_uid[loop_item], role_item])">\n
+ </dtml-in>\n
+ </dtml-if>\n
+ </dtml-in>\n
+ <dtml-if expr="len(row_list) > 0">\n
+INSERT INTO\n
+ roles_and_users\n
+VALUES\n
+ <dtml-in prefix="row" expr="row_list">\n
+(<dtml-sqlvar expr="row_item[0]" type="string">, <dtml-sqlvar expr="row_item[1]" type="string">)\n
+<dtml-if sequence-end><dtml-else>,</dtml-if>\n
+ </dtml-in>\n
+ </dtml-if>\n
+</dtml-let>\n
+
+
+]]></string> </value>
</item>
</dictionary>
</state>
@@ -14537,7 +15382,7 @@ CREATE TABLE `catalog` (\n
</dictionary>
</pickle>
</record>
- <record id="96" aka="AAAAAAAAAGA=">
+ <record id="98" aka="AAAAAAAAAGI=">
<pickle>
<tuple>
<tuple>
@@ -14577,13 +15422,134 @@ CREATE TABLE `catalog` (\n
<item>
<key> <string>_data</string> </key>
<value>
- <dictionary/>
+ <dictionary>
+ <item>
+ <key> <string>getDestinationPaymentUid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getDestinationSectionUid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getDestinationUid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getInventoriatedQuantity</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getPortalType</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getPrice</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getResourceUid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getSimulationState</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getSourcePaymentUid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getSourceSectionUid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getSourceUid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getStartDate</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getStopDate</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getVariationText</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>isAccountable</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>isMovement</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>uid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ </dictionary>
</value>
</item>
<item>
<key> <string>_keys</string> </key>
<value>
- <list/>
+ <list>
+<string>uid</string>
+<string>getResourceUid</string>
+<string>getInventoriatedQuantity</string>
+<string>getSourceUid</string>
+<string>getDestinationUid</string>
+<string>getSourceSectionUid</string>
+<string>getDestinationSectionUid</string>
+<string>isMovement</string>
+<string>getSourcePaymentUid</string>
+<string>getDestinationPaymentUid</string>
+<string>getSimulationState</string>
+<string>getPrice</string>
+<string>getStartDate</string>
+<string>getStopDate</string>
+<string>isAccountable</string>
+<string>getPortalType</string>
+<string>getVariationText</string>
+ </list>
</value>
</item>
</dictionary>
@@ -14599,7 +15565,23 @@ CREATE TABLE `catalog` (\n
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string></string> </value>
+ <value> <string>uid\r\n
+getResourceUid\r\n
+getInventoriatedQuantity\r\n
+getSourceUid\r\n
+getDestinationUid\r\n
+getSourceSectionUid\r\n
+getDestinationSectionUid\r\n
+isMovement\r\n
+getSourcePaymentUid\r\n
+getDestinationPaymentUid\r\n
+getSimulationState\r\n
+getPrice\r\n
+getStartDate\r\n
+getStopDate\r\n
+isAccountable\r\n
+getPortalType\r\n
+getVariationText</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -14625,7 +15607,7 @@ CREATE TABLE `catalog` (\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_create_category</string> </value>
+ <value> <string>z_catalog_stock</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -14637,20 +15619,74 @@ CREATE TABLE `catalog` (\n
</item>
<item>
<key> <string>src</string> </key>
- <value> <string># Host: \n
-# Database: test\n
-# Table: \'category\'\n
-# \n
-CREATE TABLE `category` (\n
- `uid` int(11) default \'0\',\n
- `category_uid` int(11) default \'0\',\n
- `base_category_uid` int(11) default \'0\',\n
- `category_strict_membership` tinyint(1) default \'0\',\n
- KEY `uid` (`uid`),\n
- KEY `category_strict_membership` (`category_strict_membership`),\n
- KEY `Membership` (`category_uid`,`base_category_uid`),\n
- KEY `FuzzyMembership` (`category_uid`)\n
-) TYPE = InnoDB; </string> </value>
+ <value> <string encoding="cdata"><![CDATA[
+
+<dtml-if isMovement>\n
+<dtml-if getResourceUid>\n
+<dtml-if getDestinationUid>\n
+INSERT INTO\n
+ stock\n
+VALUES\n
+(\n
+ <dtml-sqlvar uid type="int">,\n
+ <dtml-sqlvar getDestinationUid type="int">,\n
+ <dtml-if getDestinationSectionUid><dtml-sqlvar getDestinationSectionUid type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getDestinationPaymentUid><dtml-sqlvar getDestinationPaymentUid type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getSourceSectionUid><dtml-sqlvar getSourceSectionUid type="int"><dtml-else>NULL</dtml-if>, \n
+ <dtml-sqlvar getResourceUid type="int">,\n
+ <dtml-if getInventoriatedQuantity><dtml-sqlvar "-getInventoriatedQuantity" type="float"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getStopDate><dtml-sqlvar getStopDate type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getPrice><dtml-sqlvar getPrice type="float"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if isAccountable><dtml-sqlvar isAccountable type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getPortalType><dtml-sqlvar getPortalType type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getSimulationState><dtml-sqlvar getSimulationState type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if "getVariationText is not None"><dtml-sqlvar getVariationText type="string"><dtml-else>NULL</dtml-if>\n
+)\n
+<dtml-if getSourceUid>\n
+,\n
+(\n
+ <dtml-sqlvar uid type="int">,\n
+ <dtml-sqlvar getSourceUid type="int">, \n
+ <dtml-if getSourceSectionUid><dtml-sqlvar getSourceSectionUid type="int"><dtml-else>NULL</dtml-if>, \n
+ <dtml-if getSourcePaymentUid><dtml-sqlvar getSourcePaymentUid type="int"><dtml-else>NULL</dtml-if>, \n
+ <dtml-if getDestinationSectionUid><dtml-sqlvar getDestinationSectionUid type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-sqlvar getResourceUid type="int">, \n
+ <dtml-if getInventoriatedQuantity><dtml-sqlvar "getInventoriatedQuantity" type="float"><dtml-else>NULL</dtml-if>, \n
+ <dtml-if getStartDate><dtml-sqlvar getStartDate type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getPrice><dtml-sqlvar getPrice type="float"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if isAccountable><dtml-sqlvar isAccountable type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getPortalType><dtml-sqlvar getPortalType type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getSimulationState><dtml-sqlvar getSimulationState type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if "getVariationText is not None"><dtml-sqlvar getVariationText type="string"><dtml-else>NULL</dtml-if>\n
+)\n
+</dtml-if>\n
+<dtml-else>\n
+<dtml-if getSourceUid>\n
+INSERT INTO\n
+ stock\n
+VALUES\n
+(\n
+ <dtml-sqlvar uid type="int">,\n
+ <dtml-sqlvar getSourceUid type="int">, \n
+ <dtml-if getSourceSectionUid><dtml-sqlvar getSourceSectionUid type="int"><dtml-else>NULL</dtml-if>, \n
+ <dtml-if getSourcePaymentUid><dtml-sqlvar getSourcePaymentUid type="int"><dtml-else>NULL</dtml-if>, \n
+ <dtml-if getDestinationSectionUid><dtml-sqlvar getDestinationSectionUid type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-sqlvar getResourceUid type="int">, \n
+ <dtml-if getInventoriatedQuantity><dtml-sqlvar "getInventoriatedQuantity" type="float"><dtml-else>NULL</dtml-if>, \n
+ <dtml-if getStartDate><dtml-sqlvar getStartDate type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getPrice><dtml-sqlvar getPrice type="float"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if isAccountable><dtml-sqlvar isAccountable type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getPortalType><dtml-sqlvar getPortalType type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getSimulationState><dtml-sqlvar getSimulationState type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if "getVariationText is not None"><dtml-sqlvar getVariationText type="string"><dtml-else>NULL</dtml-if>\n
+)\n
+</dtml-if>\n
+</dtml-if>\n
+</dtml-if>\n
+</dtml-if>\n
+
+
+]]></string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -14684,20 +15720,74 @@ CREATE TABLE `category` (\n
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string># Host: \n
-# Database: test\n
-# Table: \'category\'\n
-# \n
-CREATE TABLE `category` (\n
- `uid` int(11) default \'0\',\n
- `category_uid` int(11) default \'0\',\n
- `base_category_uid` int(11) default \'0\',\n
- `category_strict_membership` tinyint(1) default \'0\',\n
- KEY `uid` (`uid`),\n
- KEY `category_strict_membership` (`category_strict_membership`),\n
- KEY `Membership` (`category_uid`,`base_category_uid`),\n
- KEY `FuzzyMembership` (`category_uid`)\n
-) TYPE = InnoDB; </string> </value>
+ <value> <string encoding="cdata"><![CDATA[
+
+<dtml-if isMovement>\n
+<dtml-if getResourceUid>\n
+<dtml-if getDestinationUid>\n
+INSERT INTO\n
+ stock\n
+VALUES\n
+(\n
+ <dtml-sqlvar uid type="int">,\n
+ <dtml-sqlvar getDestinationUid type="int">,\n
+ <dtml-if getDestinationSectionUid><dtml-sqlvar getDestinationSectionUid type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getDestinationPaymentUid><dtml-sqlvar getDestinationPaymentUid type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getSourceSectionUid><dtml-sqlvar getSourceSectionUid type="int"><dtml-else>NULL</dtml-if>, \n
+ <dtml-sqlvar getResourceUid type="int">,\n
+ <dtml-if getInventoriatedQuantity><dtml-sqlvar "-getInventoriatedQuantity" type="float"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getStopDate><dtml-sqlvar getStopDate type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getPrice><dtml-sqlvar getPrice type="float"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if isAccountable><dtml-sqlvar isAccountable type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getPortalType><dtml-sqlvar getPortalType type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getSimulationState><dtml-sqlvar getSimulationState type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if "getVariationText is not None"><dtml-sqlvar getVariationText type="string"><dtml-else>NULL</dtml-if>\n
+)\n
+<dtml-if getSourceUid>\n
+,\n
+(\n
+ <dtml-sqlvar uid type="int">,\n
+ <dtml-sqlvar getSourceUid type="int">, \n
+ <dtml-if getSourceSectionUid><dtml-sqlvar getSourceSectionUid type="int"><dtml-else>NULL</dtml-if>, \n
+ <dtml-if getSourcePaymentUid><dtml-sqlvar getSourcePaymentUid type="int"><dtml-else>NULL</dtml-if>, \n
+ <dtml-if getDestinationSectionUid><dtml-sqlvar getDestinationSectionUid type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-sqlvar getResourceUid type="int">, \n
+ <dtml-if getInventoriatedQuantity><dtml-sqlvar "getInventoriatedQuantity" type="float"><dtml-else>NULL</dtml-if>, \n
+ <dtml-if getStartDate><dtml-sqlvar getStartDate type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getPrice><dtml-sqlvar getPrice type="float"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if isAccountable><dtml-sqlvar isAccountable type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getPortalType><dtml-sqlvar getPortalType type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getSimulationState><dtml-sqlvar getSimulationState type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if "getVariationText is not None"><dtml-sqlvar getVariationText type="string"><dtml-else>NULL</dtml-if>\n
+)\n
+</dtml-if>\n
+<dtml-else>\n
+<dtml-if getSourceUid>\n
+INSERT INTO\n
+ stock\n
+VALUES\n
+(\n
+ <dtml-sqlvar uid type="int">,\n
+ <dtml-sqlvar getSourceUid type="int">, \n
+ <dtml-if getSourceSectionUid><dtml-sqlvar getSourceSectionUid type="int"><dtml-else>NULL</dtml-if>, \n
+ <dtml-if getSourcePaymentUid><dtml-sqlvar getSourcePaymentUid type="int"><dtml-else>NULL</dtml-if>, \n
+ <dtml-if getDestinationSectionUid><dtml-sqlvar getDestinationSectionUid type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-sqlvar getResourceUid type="int">, \n
+ <dtml-if getInventoriatedQuantity><dtml-sqlvar "getInventoriatedQuantity" type="float"><dtml-else>NULL</dtml-if>, \n
+ <dtml-if getStartDate><dtml-sqlvar getStartDate type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getPrice><dtml-sqlvar getPrice type="float"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if isAccountable><dtml-sqlvar isAccountable type="int"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getPortalType><dtml-sqlvar getPortalType type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if getSimulationState><dtml-sqlvar getSimulationState type="string"><dtml-else>NULL</dtml-if>,\n
+ <dtml-if "getVariationText is not None"><dtml-sqlvar getVariationText type="string"><dtml-else>NULL</dtml-if>\n
+)\n
+</dtml-if>\n
+</dtml-if>\n
+</dtml-if>\n
+</dtml-if>\n
+
+
+]]></string> </value>
</item>
</dictionary>
</state>
@@ -14711,7 +15801,7 @@ CREATE TABLE `category` (\n
</dictionary>
</pickle>
</record>
- <record id="97" aka="AAAAAAAAAGE=">
+ <record id="99" aka="AAAAAAAAAGM=">
<pickle>
<tuple>
<tuple>
@@ -14751,13 +15841,134 @@ CREATE TABLE `category` (\n
<item>
<key> <string>_data</string> </key>
<value>
- <dictionary/>
+ <dictionary>
+ <item>
+ <key> <string>getDestinationPaymentUid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getDestinationSectionUid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getDestinationUid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getInventoriatedQuantity</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getPortalType</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getPrice</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getResourceUid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getSimulationState</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getSourcePaymentUid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getSourceSectionUid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getSourceUid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getStartDate</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getStopDate</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getVariationText</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>isAccountable</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>isMovement</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>uid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ </dictionary>
</value>
</item>
<item>
<key> <string>_keys</string> </key>
<value>
- <list/>
+ <list>
+<string>uid</string>
+<string>getResourceUid</string>
+<string>getInventoriatedQuantity</string>
+<string>getSourceUid</string>
+<string>getDestinationUid</string>
+<string>getSourceSectionUid</string>
+<string>getDestinationSectionUid</string>
+<string>isMovement</string>
+<string>getSourcePaymentUid</string>
+<string>getDestinationPaymentUid</string>
+<string>getSimulationState</string>
+<string>getPrice</string>
+<string>getStartDate</string>
+<string>getStopDate</string>
+<string>isAccountable</string>
+<string>getPortalType</string>
+<string>getVariationText</string>
+ </list>
</value>
</item>
</dictionary>
@@ -14773,7 +15984,23 @@ CREATE TABLE `category` (\n
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string></string> </value>
+ <value> <string>uid\r\n
+getResourceUid\r\n
+getInventoriatedQuantity\r\n
+getSourceUid\r\n
+getDestinationUid\r\n
+getSourceSectionUid\r\n
+getDestinationSectionUid\r\n
+isMovement\r\n
+getSourcePaymentUid\r\n
+getDestinationPaymentUid\r\n
+getSimulationState\r\n
+getPrice\r\n
+getStartDate\r\n
+getStopDate\r\n
+isAccountable\r\n
+getPortalType\r\n
+getVariationText</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -14799,7 +16026,7 @@ CREATE TABLE `category` (\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_create_compatibility</string> </value>
+ <value> <string>z_catalog_stock_list</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -14811,33 +16038,49 @@ CREATE TABLE `category` (\n
</item>
<item>
<key> <string>src</string> </key>
- <value> <string># Host:\n
-# Database: test\n
-# Table: \'compatibility\'\n
-#\n
-CREATE TABLE `compatibility` (\n
- `uid` int(11) NOT NULL,\n
- `Creator` varchar(30) default \'\',\n
- `Date` datetime default \'0000-00-00 00:00:00\',\n
- `PrincipiaSearchSource` text,\n
- `SearchableText` text,\n
- `EffectiveDate` datetime default \'0000-00-00 00:00:00\',\n
- `ExpiresDate` datetime default \'0000-00-00 00:00:00\',\n
- `ModificationDate` datetime default \'0000-00-00 00:00:00\',\n
- `Type` varchar(30) default \'\',\n
- `bobobase_modification_time` datetime default \'0000-00-00 00:00:00\',\n
- `created` datetime default \'0000-00-00 00:00:00\',\n
- `effective` datetime default \'0000-00-00 00:00:00\',\n
- `expires` datetime default \'0000-00-00 00:00:00\',\n
- `getIcon` varchar(30) default \'\',\n
- `in_reply_to` varchar(255) default \'\',\n
- `modified` datetime default \'0000-00-00 00:00:00\',\n
- `review_state` varchar(30) default \'\',\n
- `summary` text,\n
- PRIMARY KEY (`uid`),\n
- KEY `Type` (`Type`),\n
- KEY `review_state` (`review_state`)\n
-) TYPE=InnoDB;</string> </value>
+ <value> <string encoding="cdata"><![CDATA[
+
+<dtml-let row_list="[]">\n
+ <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
+ <dtml-if "isMovement[loop_item]">\n
+ <dtml-if "getResourceUid[loop_item]">\n
+ <dtml-if "getDestinationUid[loop_item]">\n
+ <dtml-call expr="row_list.append([uid[loop_item], getDestinationUid[loop_item], getDestinationSectionUid[loop_item], getDestinationPaymentUid[loop_item], getSourceSectionUid[loop_item], getResourceUid[loop_item], -getInventoriatedQuantity[loop_item], getStopDate[loop_item], getPrice[loop_item], isAccountable[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getVariationText[loop_item]])">\n
+ </dtml-if>\n
+ <dtml-if "getSourceUid[loop_item]">\n
+ <dtml-call expr="row_list.append([uid[loop_item], getSourceUid[loop_item], getSourceSectionUid[loop_item], getSourcePaymentUidList[loop_item], getDestinationSectionUid[loop_item], getResourceUid[loop_item], getInventoriatedQuantity[loop_item], getStartDate[loop_item], getPrice[loop_item], isAccountable[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getVariationText[loop_item]])">\n
+ </dtml-if>\n
+ </dtml-if>\n
+ </dtml-if>\n
+ </dtml-in> \n
+ \n
+ <dtml-if "len(row_list) > 0">\n
+INSERT INTO\n
+ stock\n
+VALUES\n
+ <dtml-in prefix="row" expr="row_list">\n
+(\n
+ <dtml-sqlvar expr="row_item[0]" type="int">,\n
+ <dtml-sqlvar expr="row_item[1]" type="int">, \n
+ <dtml-sqlvar expr="row_item[2]" type="int" optional>, \n
+ <dtml-sqlvar expr="row_item[3]" type="int" optional>, \n
+ <dtml-sqlvar expr="row_item[4]" type="int" optional>,\n
+ <dtml-sqlvar expr="row_item[5]" type="int">, \n
+ <dtml-sqlvar expr="row_item[6]" type="float" optional>,\n
+ <dtml-sqlvar expr="row_item[7]" type="string" optional>\n
+ <dtml-sqlvar expr="row_item[8]" type="float" optional>\n
+ <dtml-sqlvar expr="row_item[9]" type="int" optional>\n
+ <dtml-sqlvar expr="row_item[10]" type="string" optional>\n
+ <dtml-sqlvar expr="row_item[11]" type="string" optional>\n
+ <dtml-sqlvar expr="row_item[12]" type="string" optional>\n
+)\n
+<dtml-if sequence-end><dtml-else>,</dtml-if>\n
+ </dtml-in>\n
+ </dtml-if>\n
+</dtml-let>\n
+
+
+]]></string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -14871,198 +16114,50 @@ CREATE TABLE `compatibility` (\n
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string># Host:\n
-# Database: test\n
-# Table: \'compatibility\'\n
-#\n
-CREATE TABLE `compatibility` (\n
- `uid` int(11) NOT NULL,\n
- `Creator` varchar(30) default \'\',\n
- `Date` datetime default \'0000-00-00 00:00:00\',\n
- `PrincipiaSearchSource` text,\n
- `SearchableText` text,\n
- `EffectiveDate` datetime default \'0000-00-00 00:00:00\',\n
- `ExpiresDate` datetime default \'0000-00-00 00:00:00\',\n
- `ModificationDate` datetime default \'0000-00-00 00:00:00\',\n
- `Type` varchar(30) default \'\',\n
- `bobobase_modification_time` datetime default \'0000-00-00 00:00:00\',\n
- `created` datetime default \'0000-00-00 00:00:00\',\n
- `effective` datetime default \'0000-00-00 00:00:00\',\n
- `expires` datetime default \'0000-00-00 00:00:00\',\n
- `getIcon` varchar(30) default \'\',\n
- `in_reply_to` varchar(255) default \'\',\n
- `modified` datetime default \'0000-00-00 00:00:00\',\n
- `review_state` varchar(30) default \'\',\n
- `summary` text,\n
- PRIMARY KEY (`uid`),\n
- KEY `Type` (`Type`),\n
- KEY `review_state` (`review_state`)\n
-) TYPE=InnoDB;</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="98" aka="AAAAAAAAAGI=">
- <pickle>
- <tuple>
- <tuple>
- <string>Products.ZSQLMethods.SQL</string>
- <string>SQL</string>
- </tuple>
- <none/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>jp</string> </key>
- <value>
- <list>
- <string>Owner</string>
- </list>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <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/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>_col</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>_owner</string> </key>
- <value>
- <tuple>
- <list>
- <string>nexedi</string>
- <string>acl_users</string>
- </list>
-<string>jp</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>arguments_src</string> </key>
- <value> <string></string> </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_create_delivery</string> </value>
- </item>
- <item>
- <key> <string>src</string> </key>
- <value> <string>CREATE TABLE `delivery` (\n
- `uid` int(11) default \'0\',\n
- `source_uid` int(11) default \'0\',\n
- `destination_uid` int(11) default \'0\',\n
- `source_section_uid` int(11) default \'0\',\n
- `destination_section_uid` int(11) default \'0\',\n
- `resource_uid` int(11) default \'0\',\n
- `start_date` datetime default NULL,\n
- `stop_date` datetime default NULL,\n
- KEY `uid` (`uid`),\n
- KEY `source_uid` (`source_uid`),\n
- KEY `destination_uid` (`destination_uid`),\n
- KEY `source_section_uid` (`source_section_uid`),\n
- KEY `destination_section_uid` (`destination_section_uid`),\n
- KEY `resource_uid` (`resource_uid`)\n
-) TYPE=InnoDB</string> </value>
- </item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </klass>
- <none/>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<string>
+<dtml-let row_list="[]">\n
+ <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
+ <dtml-if "isMovement[loop_item]">\n
+ <dtml-if "getResourceUid[loop_item]">\n
+ <dtml-if "getDestinationUid[loop_item]">\n
+ <dtml-call expr="row_list.append([uid[loop_item], getDestinationUid[loop_item], getDestinationSectionUid[loop_item], getDestinationPaymentUid[loop_item], getSourceSectionUid[loop_item], getResourceUid[loop_item], -getInventoriatedQuantity[loop_item], getStopDate[loop_item], getPrice[loop_item], isAccountable[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getVariationText[loop_item]])">\n
+ </dtml-if>\n
+ <dtml-if "getSourceUid[loop_item]">\n
+ <dtml-call expr="row_list.append([uid[loop_item], getSourceUid[loop_item], getSourceSectionUid[loop_item], getSourcePaymentUidList[loop_item], getDestinationSectionUid[loop_item], getResourceUid[loop_item], getInventoriatedQuantity[loop_item], getStartDate[loop_item], getPrice[loop_item], isAccountable[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getVariationText[loop_item]])">\n
+ </dtml-if>\n
+ </dtml-if>\n
+ </dtml-if>\n
+ </dtml-in> \n
+ \n
+ <dtml-if "len(row_list) > 0">\n
+INSERT INTO\n
+ stock\n
+VALUES\n
+ <dtml-in prefix="row" expr="row_list">\n
+(\n
+ <dtml-sqlvar expr="row_item[0]" type="int">,\n
+ <dtml-sqlvar expr="row_item[1]" type="int">, \n
+ <dtml-sqlvar expr="row_item[2]" type="int" optional>, \n
+ <dtml-sqlvar expr="row_item[3]" type="int" optional>, \n
+ <dtml-sqlvar expr="row_item[4]" type="int" optional>,\n
+ <dtml-sqlvar expr="row_item[5]" type="int">, \n
+ <dtml-sqlvar expr="row_item[6]" type="float" optional>,\n
+ <dtml-sqlvar expr="row_item[7]" type="string" optional>\n
+ <dtml-sqlvar expr="row_item[8]" type="float" optional>\n
+ <dtml-sqlvar expr="row_item[9]" type="int" optional>\n
+ <dtml-sqlvar expr="row_item[10]" type="string" optional>\n
+ <dtml-sqlvar expr="row_item[11]" type="string" optional>\n
+ <dtml-sqlvar expr="row_item[12]" type="string" optional>\n
+)\n
+<dtml-if sequence-end><dtml-else>,</dtml-if>\n
+ </dtml-in>\n
+ </dtml-if>\n
+</dtml-let>\n
+
]]></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>CREATE TABLE `delivery` (\n
- `uid` int(11) default \'0\',\n
- `source_uid` int(11) default \'0\',\n
- `destination_uid` int(11) default \'0\',\n
- `source_section_uid` int(11) default \'0\',\n
- `destination_section_uid` int(11) default \'0\',\n
- `resource_uid` int(11) default \'0\',\n
- `start_date` datetime default NULL,\n
- `stop_date` datetime default NULL,\n
- KEY `uid` (`uid`),\n
- KEY `source_uid` (`source_uid`),\n
- KEY `destination_uid` (`destination_uid`),\n
- KEY `source_section_uid` (`source_section_uid`),\n
- KEY `destination_section_uid` (`destination_section_uid`),\n
- KEY `resource_uid` (`resource_uid`)\n
-) TYPE=InnoDB</string> </value>
- </item>
</dictionary>
</state>
</object>
@@ -15075,7 +16170,7 @@ CREATE TABLE `compatibility` (\n
</dictionary>
</pickle>
</record>
- <record id="99" aka="AAAAAAAAAGM=">
+ <record id="100" aka="AAAAAAAAAGQ=">
<pickle>
<tuple>
<tuple>
@@ -15115,13 +16210,29 @@ CREATE TABLE `compatibility` (\n
<item>
<key> <string>_data</string> </key>
<value>
- <dictionary/>
+ <dictionary>
+ <item>
+ <key> <string>Subject</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>uid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ </dictionary>
</value>
</item>
<item>
<key> <string>_keys</string> </key>
<value>
- <list/>
+ <list>
+<string>uid</string>
+<string>Subject</string>
+ </list>
</value>
</item>
</dictionary>
@@ -15137,7 +16248,8 @@ CREATE TABLE `compatibility` (\n
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string></string> </value>
+ <value> <string>uid\n
+Subject</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -15163,7 +16275,7 @@ CREATE TABLE `compatibility` (\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_create_movement</string> </value>
+ <value> <string>z_catalog_subject</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -15175,43 +16287,27 @@ CREATE TABLE `compatibility` (\n
</item>
<item>
<key> <string>src</string> </key>
- <value> <string># Host:\n
-# Database: test\n
-# Table: \'movement\'\n
-#\n
-CREATE TABLE `movement` (\n
- `uid` int(11) default \'0\',\n
- `delivery_uid` int(11) default \'0\',\n
- `source_uid` int(11) default \'0\',\n
- `destination_uid` int(11) default \'0\',\n
- `resource_uid` int(11) default \'0\',\n
- `quantity` real default \'0.0\',\n
- `inventory` real default NULL,\n
- `start_date` datetime,\n
- `stop_date` datetime,\n
- `target_quantity` real default \'0.0\',\n
- `target_start_date` datetime,\n
- `target_stop_date` datetime,\n
- `price` real,\n
- `total_price` real,\n
- `target_total_price` real,\n
- `has_cell_content` bool,\n
- `is_accountable` bool,\n
- `is_orderable` bool,\n
- `is_deliverable` bool,\n
- `variation_text` VARCHAR(100),\n
- KEY `uid` (`uid`),\n
- KEY `delivery_uid` (`delivery_uid`),\n
- KEY `source_uid` (`source_uid`),\n
- KEY `destination_uid` (`destination_uid`),\n
- KEY `resource_uid` (`resource_uid`),\n
- KEY `has_cell_content` (`has_cell_content`),\n
- KEY `is_accountable` (`is_accountable`),\n
- KEY `is_orderable` (`is_orderable`),\n
- KEY `is_deliverable` (`is_deliverable`),\n
- KEY `variation_text` (`variation_text`)\n
-) TYPE=InnoDB;\n
-</string> </value>
+ <value> <string encoding="cdata"><![CDATA[
+
+<dtml-if Subject>\n
+INSERT INTO subject VALUES \n
+<dtml-try>\n
+<dtml-in "Subject.split()">\n
+(<dtml-sqlvar uid type="int">, <dtml-sqlvar sequence-item\n
+type=string>)<dtml-if sequence-end><dtml-else>,</dtml-if>\n
+</dtml-in> \n
+;\n
+<dtml-except>\n
+<dtml-in Subject>\n
+(<dtml-sqlvar uid type="int">, <dtml-sqlvar sequence-item\n
+type=string>)<dtml-if sequence-end><dtml-else>,</dtml-if>\n
+</dtml-in> \n
+;\n
+</dtml-try>\n
+</dtml-if>\n
+
+
+]]></string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -15245,43 +16341,27 @@ CREATE TABLE `movement` (\n
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string># Host:\n
-# Database: test\n
-# Table: \'movement\'\n
-#\n
-CREATE TABLE `movement` (\n
- `uid` int(11) default \'0\',\n
- `delivery_uid` int(11) default \'0\',\n
- `source_uid` int(11) default \'0\',\n
- `destination_uid` int(11) default \'0\',\n
- `resource_uid` int(11) default \'0\',\n
- `quantity` real default \'0.0\',\n
- `inventory` real default NULL,\n
- `start_date` datetime,\n
- `stop_date` datetime,\n
- `target_quantity` real default \'0.0\',\n
- `target_start_date` datetime,\n
- `target_stop_date` datetime,\n
- `price` real,\n
- `total_price` real,\n
- `target_total_price` real,\n
- `has_cell_content` bool,\n
- `is_accountable` bool,\n
- `is_orderable` bool,\n
- `is_deliverable` bool,\n
- `variation_text` VARCHAR(100),\n
- KEY `uid` (`uid`),\n
- KEY `delivery_uid` (`delivery_uid`),\n
- KEY `source_uid` (`source_uid`),\n
- KEY `destination_uid` (`destination_uid`),\n
- KEY `resource_uid` (`resource_uid`),\n
- KEY `has_cell_content` (`has_cell_content`),\n
- KEY `is_accountable` (`is_accountable`),\n
- KEY `is_orderable` (`is_orderable`),\n
- KEY `is_deliverable` (`is_deliverable`),\n
- KEY `variation_text` (`variation_text`)\n
-) TYPE=InnoDB;\n
-</string> </value>
+ <value> <string encoding="cdata"><![CDATA[
+
+<dtml-if Subject>\n
+INSERT INTO subject VALUES \n
+<dtml-try>\n
+<dtml-in "Subject.split()">\n
+(<dtml-sqlvar uid type="int">, <dtml-sqlvar sequence-item\n
+type=string>)<dtml-if sequence-end><dtml-else>,</dtml-if>\n
+</dtml-in> \n
+;\n
+<dtml-except>\n
+<dtml-in Subject>\n
+(<dtml-sqlvar uid type="int">, <dtml-sqlvar sequence-item\n
+type=string>)<dtml-if sequence-end><dtml-else>,</dtml-if>\n
+</dtml-in> \n
+;\n
+</dtml-try>\n
+</dtml-if>\n
+
+
+]]></string> </value>
</item>
</dictionary>
</state>
@@ -15295,7 +16375,7 @@ CREATE TABLE `movement` (\n
</dictionary>
</pickle>
</record>
- <record id="100" aka="AAAAAAAAAGQ=">
+ <record id="101" aka="AAAAAAAAAGU=">
<pickle>
<tuple>
<tuple>
@@ -15335,13 +16415,29 @@ CREATE TABLE `movement` (\n
<item>
<key> <string>_data</string> </key>
<value>
- <dictionary/>
+ <dictionary>
+ <item>
+ <key> <string>Subject</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>uid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ </dictionary>
</value>
</item>
<item>
<key> <string>_keys</string> </key>
<value>
- <list/>
+ <list>
+<string>Subject</string>
+<string>uid</string>
+ </list>
</value>
</item>
</dictionary>
@@ -15357,7 +16453,8 @@ CREATE TABLE `movement` (\n
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string></string> </value>
+ <value> <string>Subject\r\n
+uid</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -15383,7 +16480,7 @@ CREATE TABLE `movement` (\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_create_record</string> </value>
+ <value> <string>z_catalog_subject_list</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -15395,18 +16492,25 @@ CREATE TABLE `movement` (\n
</item>
<item>
<key> <string>src</string> </key>
- <value> <string># Host:\n
-# Database: test\n
-# Table: \'record\'\n
-#\n
-CREATE TABLE `record` (\n
- `path` varchar(255) NOT NULL default \'\',\n
- `catalog` BOOL NOT NULL default 0,\n
- `played` BOOL NOT NULL default 0,\n
- `date` DATETIME NOT NULL,\n
- KEY `path` (`path`),\n
- KEY `played` (`played`)\n
-) TYPE=InnoDB;</string> </value>
+ <value> <string encoding="cdata"><![CDATA[
+
+INSERT INTO subject VALUES \n
+<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
+ <dtml-if sequence-start><dtml-else>,</dtml-if>\n
+ <dtml-let subject="Subject[loop_item]">\n
+ <dtml-if subject>\n
+ <dtml-in prefix="word" expr="subject.split()">\n
+<dtml-if sequence-start><dtml-else>,</dtml-if>\n
+(<dtml-sqlvar "uid[loop_item]" type="int">, <dtml-sqlvar word_item type="string">)\n
+ </dtml-in>\n
+ <dtml-else>\n
+(<dtml-sqlvar "uid[loop_item]" type="int">, NULL)\n
+ </dtml-if>\n
+ </dtml-let>\n
+</dtml-in>\n
+
+
+]]></string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -15440,18 +16544,25 @@ CREATE TABLE `record` (\n
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string># Host:\n
-# Database: test\n
-# Table: \'record\'\n
-#\n
-CREATE TABLE `record` (\n
- `path` varchar(255) NOT NULL default \'\',\n
- `catalog` BOOL NOT NULL default 0,\n
- `played` BOOL NOT NULL default 0,\n
- `date` DATETIME NOT NULL,\n
- KEY `path` (`path`),\n
- KEY `played` (`played`)\n
-) TYPE=InnoDB;</string> </value>
+ <value> <string encoding="cdata"><![CDATA[
+
+INSERT INTO subject VALUES \n
+<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
+ <dtml-if sequence-start><dtml-else>,</dtml-if>\n
+ <dtml-let subject="Subject[loop_item]">\n
+ <dtml-if subject>\n
+ <dtml-in prefix="word" expr="subject.split()">\n
+<dtml-if sequence-start><dtml-else>,</dtml-if>\n
+(<dtml-sqlvar "uid[loop_item]" type="int">, <dtml-sqlvar word_item type="string">)\n
+ </dtml-in>\n
+ <dtml-else>\n
+(<dtml-sqlvar "uid[loop_item]" type="int">, NULL)\n
+ </dtml-if>\n
+ </dtml-let>\n
+</dtml-in>\n
+
+
+]]></string> </value>
</item>
</dictionary>
</state>
@@ -15465,7 +16576,7 @@ CREATE TABLE `record` (\n
</dictionary>
</pickle>
</record>
- <record id="101" aka="AAAAAAAAAGU=">
+ <record id="102" aka="AAAAAAAAAGY=">
<pickle>
<tuple>
<tuple>
@@ -15505,13 +16616,50 @@ CREATE TABLE `record` (\n
<item>
<key> <string>_data</string> </key>
<value>
- <dictionary/>
+ <dictionary>
+ <item>
+ <key> <string>from_table_list</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>select_expression</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>selection_domain</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>selection_report</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>where_expression</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ </dictionary>
</value>
</item>
<item>
<key> <string>_keys</string> </key>
<value>
- <list/>
+ <list>
+<string>from_table_list</string>
+<string>where_expression</string>
+<string>select_expression</string>
+<string>selection_domain</string>
+<string>selection_report</string>
+ </list>
</value>
</item>
</dictionary>
@@ -15527,19 +16675,23 @@ CREATE TABLE `record` (\n
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string></string> </value>
+ <value> <string>from_table_list\n
+where_expression\n
+select_expression\n
+selection_domain\n
+selection_report</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
- <value> <int>0</int> </value>
+ <value> <int>180</int> </value>
</item>
<item>
<key> <string>class_file_</string> </key>
- <value> <string></string> </value>
+ <value> <string>zsqlbrain.py</string> </value>
</item>
<item>
<key> <string>class_name_</string> </key>
- <value> <string></string> </value>
+ <value> <string>ZSQLBrain</string> </value>
</item>
<item>
<key> <string>connection_hook</string> </key>
@@ -15553,24 +16705,47 @@ CREATE TABLE `record` (\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_create_roles_and_users</string> </value>
+ <value> <string>z_count_results</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
- <value> <int>100</int> </value>
+ <value> <int>1000</int> </value>
</item>
<item>
<key> <string>max_rows_</string> </key>
- <value> <int>1000</int> </value>
+ <value> <int>1</int> </value>
</item>
<item>
<key> <string>src</string> </key>
- <value> <string>CREATE TABLE roles_and_users (\n
- uid INT,\n
- allowedRolesAndUsers VARCHAR(40),\n
- KEY `uid` (`uid`),\n
- KEY `allowedRolesAndUsers` (`allowedRolesAndUsers`)\n
-) TYPE=InnoDB; </string> </value>
+ <value> <string encoding="cdata"><![CDATA[
+
+SELECT\n
+ COUNT(DISTINCT catalog.uid) <dtml-comment>We need subselect for better statistics</dtml-comment>\n
+<dtml-if select_expression>\n
+ , <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 selection_domain>, <dtml-var "selection_domain.asSqlJoinExpression()"> </dtml-if>\n
+ <dtml-if selection_report>, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if>\n
+WHERE\n
+ 1 = 1\n
+<dtml-if where_expression>\n
+ AND <dtml-var where_expression>\n
+</dtml-if>\n
+<dtml-if selection_domain>\n
+ AND <dtml-var "selection_domain.asSqlExpression()">\n
+</dtml-if>\n
+<dtml-if selection_report>\n
+ AND <dtml-var "selection_report.asSqlExpression(strict_membership=1)">\n
+</dtml-if>\n
+<dtml-if sort_on>\n
+ORDER BY\n
+ <dtml-var sort_on>\n
+</dtml-if>\n
+
+
+]]></string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -15604,12 +16779,35 @@ CREATE TABLE `record` (\n
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string>CREATE TABLE roles_and_users (\n
- uid INT,\n
- allowedRolesAndUsers VARCHAR(40),\n
- KEY `uid` (`uid`),\n
- KEY `allowedRolesAndUsers` (`allowedRolesAndUsers`)\n
-) TYPE=InnoDB; </string> </value>
+ <value> <string encoding="cdata"><![CDATA[
+
+SELECT\n
+ COUNT(DISTINCT catalog.uid) <dtml-comment>We need subselect for better statistics</dtml-comment>\n
+<dtml-if select_expression>\n
+ , <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 selection_domain>, <dtml-var "selection_domain.asSqlJoinExpression()"> </dtml-if>\n
+ <dtml-if selection_report>, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if>\n
+WHERE\n
+ 1 = 1\n
+<dtml-if where_expression>\n
+ AND <dtml-var where_expression>\n
+</dtml-if>\n
+<dtml-if selection_domain>\n
+ AND <dtml-var "selection_domain.asSqlExpression()">\n
+</dtml-if>\n
+<dtml-if selection_report>\n
+ AND <dtml-var "selection_report.asSqlExpression(strict_membership=1)">\n
+</dtml-if>\n
+<dtml-if sort_on>\n
+ORDER BY\n
+ <dtml-var sort_on>\n
+</dtml-if>\n
+
+
+]]></string> </value>
</item>
</dictionary>
</state>
@@ -15623,7 +16821,7 @@ CREATE TABLE `record` (\n
</dictionary>
</pickle>
</record>
- <record id="102" aka="AAAAAAAAAGY=">
+ <record id="103" aka="AAAAAAAAAGc=">
<pickle>
<tuple>
<tuple>
@@ -15677,12 +16875,6 @@ CREATE TABLE `record` (\n
</object>
</value>
</item>
- <item>
- <key> <string>_col</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -15717,7 +16909,7 @@ CREATE TABLE `record` (\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_create_stock</string> </value>
+ <value> <string>z_create_catalog</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -15731,33 +16923,62 @@ CREATE TABLE `record` (\n
<key> <string>src</string> </key>
<value> <string># Host:\n
# Database: test\n
-# Table: \'stock\'\n
+# Table: \'catalog\'\n
#\n
-CREATE TABLE `stock` (\n
- `uid` int(11) NOT NULL default \'0\',\n
- `node_uid` int(11),\n
- `section_uid` int(11),\n
- `payment_uid` int(11),\n
- `mirror_section_uid` int(11),\n
- `resource_uid` int(11),\n
- `quantity` real ,\n
- `date` datetime,\n
- `price` real ,\n
- `is_accountable` bool,\n
- `portal_type` VARCHAR(30),\n
+CREATE TABLE `catalog` (\n
+ `uid` int(11) NOT NULL AUTO_INCREMENT,\n
+ `security_uid` INT UNSIGNED,\n
+ `path` varchar(255) NOT NULL default \'\',\n
+ `relative_url` varchar(255) NOT NULL default \'\',\n
+ `parent_uid` int(11) default \'0\',\n
+ `id` varchar(30) default \'\',\n
+ `CreationDate` datetime default \'0000-00-00 00:00:00\',\n
+ `description` text,\n
+ `title` varchar(255) default \'\',\n
+ `meta_type` varchar(255) default \'\',\n
+ `portal_type` varchar(255) default \'\',\n
+ `opportunity_state` varchar(30) default \'\',\n
+ `default_source_reference` varchar(30) default \'\',\n
+ `default_destination_reference` varchar(30) default \'\',\n
+ `default_source_title` varchar(30) default \'\',\n
+ `default_destination_title` varchar(30) default \'\',\n
+ `default_source_section_title` varchar(30) default \'\',\n
+ `default_destination_section_title` varchar(30) default \'\',\n
+ `default_causality_id` varchar(30) default \'\',\n
+ `location` varchar(30),\n
+ `ean13_code` varchar(30),\n
+ `validation_state` varchar(30) default \'\',\n
`simulation_state` varchar(30) default \'\',\n
- `variation_text` VARCHAR(100),\n
- KEY `uid` (`uid`),\n
- KEY `quantity` (`quantity`),\n
- KEY `section_uid` (`section_uid`),\n
- KEY `mirror_section_uid` (`mirror_section_uid`),\n
- KEY `node_uid` (`node_uid`),\n
- KEY `payment_uid` (`payment_uid`),\n
- KEY `resource_uid` (`resource_uid`),\n
+ `causality_state` varchar(30) default \'\',\n
+ `discussion_state` varchar(30) default \'\',\n
+ `invoice_state` varchar(30) default \'\',\n
+ `payment_state` varchar(30) default \'\',\n
+ `event_state` varchar(30) default \'\',\n
+ `order_id` varchar(30) default \'\',\n
+ `reference` varchar(30) default \'\',\n
+ `source_reference` varchar(30) default \'\',\n
+ `destination_reference` varchar(30) default \'\',\n
+ `string_index` varchar(30),\n
+ `int_index` int(11),\n
+ `float_index` real,\n
+ PRIMARY KEY (`uid`),\n
+ KEY `security_uid` (`security_uid`),\n
+ KEY `Parent` (`parent_uid`),\n
+ KEY `Path` (`path`),\n
+ KEY `relative_url` (`relative_url`),\n
+ KEY `Type` (`meta_type`,`portal_type`),\n
+ KEY `Type1` (`portal_type`),\n
+ KEY `Type2` (`meta_type`),\n
+ KEY `opportunity_state` (`opportunity_state`),\n
+ KEY `validation_state` (`validation_state`),\n
KEY `simulation_state` (`simulation_state`),\n
- KEY `resource_node_uid` (`resource_uid`, `node_uid`),\n
- KEY `resource_section_node_uid` (`resource_uid`, `section_uid`, `node_uid`, `simulation_state`)\n
-) TYPE = InnoDB;\n
+ KEY `causality_state` (`causality_state`),\n
+ KEY `discussion_state` (`discussion_state`),\n
+ KEY `invoice_state` (`invoice_state`),\n
+ KEY `order_id` (`order_id`),\n
+ KEY `payment_state` (`payment_state`),\n
+ KEY `event_state` (`event_state`)\n
+) TYPE=InnoDB;\n
</string> </value>
</item>
<item>
@@ -15794,33 +17015,62 @@ CREATE TABLE `stock` (\n
<key> <string>raw</string> </key>
<value> <string># Host:\n
# Database: test\n
-# Table: \'stock\'\n
+# Table: \'catalog\'\n
#\n
-CREATE TABLE `stock` (\n
- `uid` int(11) NOT NULL default \'0\',\n
- `node_uid` int(11),\n
- `section_uid` int(11),\n
- `payment_uid` int(11),\n
- `mirror_section_uid` int(11),\n
- `resource_uid` int(11),\n
- `quantity` real ,\n
- `date` datetime,\n
- `price` real ,\n
- `is_accountable` bool,\n
- `portal_type` VARCHAR(30),\n
+CREATE TABLE `catalog` (\n
+ `uid` int(11) NOT NULL AUTO_INCREMENT,\n
+ `security_uid` INT UNSIGNED,\n
+ `path` varchar(255) NOT NULL default \'\',\n
+ `relative_url` varchar(255) NOT NULL default \'\',\n
+ `parent_uid` int(11) default \'0\',\n
+ `id` varchar(30) default \'\',\n
+ `CreationDate` datetime default \'0000-00-00 00:00:00\',\n
+ `description` text,\n
+ `title` varchar(255) default \'\',\n
+ `meta_type` varchar(255) default \'\',\n
+ `portal_type` varchar(255) default \'\',\n
+ `opportunity_state` varchar(30) default \'\',\n
+ `default_source_reference` varchar(30) default \'\',\n
+ `default_destination_reference` varchar(30) default \'\',\n
+ `default_source_title` varchar(30) default \'\',\n
+ `default_destination_title` varchar(30) default \'\',\n
+ `default_source_section_title` varchar(30) default \'\',\n
+ `default_destination_section_title` varchar(30) default \'\',\n
+ `default_causality_id` varchar(30) default \'\',\n
+ `location` varchar(30),\n
+ `ean13_code` varchar(30),\n
+ `validation_state` varchar(30) default \'\',\n
`simulation_state` varchar(30) default \'\',\n
- `variation_text` VARCHAR(100),\n
- KEY `uid` (`uid`),\n
- KEY `quantity` (`quantity`),\n
- KEY `section_uid` (`section_uid`),\n
- KEY `mirror_section_uid` (`mirror_section_uid`),\n
- KEY `node_uid` (`node_uid`),\n
- KEY `payment_uid` (`payment_uid`),\n
- KEY `resource_uid` (`resource_uid`),\n
+ `causality_state` varchar(30) default \'\',\n
+ `discussion_state` varchar(30) default \'\',\n
+ `invoice_state` varchar(30) default \'\',\n
+ `payment_state` varchar(30) default \'\',\n
+ `event_state` varchar(30) default \'\',\n
+ `order_id` varchar(30) default \'\',\n
+ `reference` varchar(30) default \'\',\n
+ `source_reference` varchar(30) default \'\',\n
+ `destination_reference` varchar(30) default \'\',\n
+ `string_index` varchar(30),\n
+ `int_index` int(11),\n
+ `float_index` real,\n
+ PRIMARY KEY (`uid`),\n
+ KEY `security_uid` (`security_uid`),\n
+ KEY `Parent` (`parent_uid`),\n
+ KEY `Path` (`path`),\n
+ KEY `relative_url` (`relative_url`),\n
+ KEY `Type` (`meta_type`,`portal_type`),\n
+ KEY `Type1` (`portal_type`),\n
+ KEY `Type2` (`meta_type`),\n
+ KEY `opportunity_state` (`opportunity_state`),\n
+ KEY `validation_state` (`validation_state`),\n
KEY `simulation_state` (`simulation_state`),\n
- KEY `resource_node_uid` (`resource_uid`, `node_uid`),\n
- KEY `resource_section_node_uid` (`resource_uid`, `section_uid`, `node_uid`, `simulation_state`)\n
-) TYPE = InnoDB;\n
+ KEY `causality_state` (`causality_state`),\n
+ KEY `discussion_state` (`discussion_state`),\n
+ KEY `invoice_state` (`invoice_state`),\n
+ KEY `order_id` (`order_id`),\n
+ KEY `payment_state` (`payment_state`),\n
+ KEY `event_state` (`event_state`)\n
+) TYPE=InnoDB;\n
</string> </value>
</item>
</dictionary>
@@ -15835,7 +17085,7 @@ CREATE TABLE `stock` (\n
</dictionary>
</pickle>
</record>
- <record id="103" aka="AAAAAAAAAGc=">
+ <record id="104" aka="AAAAAAAAAGg=">
<pickle>
<tuple>
<tuple>
@@ -15923,7 +17173,7 @@ CREATE TABLE `stock` (\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_create_subject</string> </value>
+ <value> <string>z_create_category</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -15935,12 +17185,20 @@ CREATE TABLE `stock` (\n
</item>
<item>
<key> <string>src</string> </key>
- <value> <string>CREATE TABLE subject (\n
- uid INT,\n
- subject VARCHAR(255),\n
+ <value> <string># Host: \n
+# Database: test\n
+# Table: \'category\'\n
+# \n
+CREATE TABLE `category` (\n
+ `uid` int(11) default \'0\',\n
+ `category_uid` int(11) default \'0\',\n
+ `base_category_uid` int(11) default \'0\',\n
+ `category_strict_membership` tinyint(1) default \'0\',\n
KEY `uid` (`uid`),\n
- KEY `allowedRolesAndUsers` (`Subject`)\n
-) TYPE=InnoDB; </string> </value>
+ KEY `category_strict_membership` (`category_strict_membership`),\n
+ KEY `Membership` (`category_uid`,`base_category_uid`),\n
+ KEY `FuzzyMembership` (`category_uid`)\n
+) TYPE = InnoDB; </string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -15974,12 +17232,20 @@ CREATE TABLE `stock` (\n
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string>CREATE TABLE subject (\n
- uid INT,\n
- subject VARCHAR(255),\n
+ <value> <string># Host: \n
+# Database: test\n
+# Table: \'category\'\n
+# \n
+CREATE TABLE `category` (\n
+ `uid` int(11) default \'0\',\n
+ `category_uid` int(11) default \'0\',\n
+ `base_category_uid` int(11) default \'0\',\n
+ `category_strict_membership` tinyint(1) default \'0\',\n
KEY `uid` (`uid`),\n
- KEY `allowedRolesAndUsers` (`Subject`)\n
-) TYPE=InnoDB; </string> </value>
+ KEY `category_strict_membership` (`category_strict_membership`),\n
+ KEY `Membership` (`category_uid`,`base_category_uid`),\n
+ KEY `FuzzyMembership` (`category_uid`)\n
+) TYPE = InnoDB; </string> </value>
</item>
</dictionary>
</state>
@@ -15993,7 +17259,7 @@ CREATE TABLE `stock` (\n
</dictionary>
</pickle>
</record>
- <record id="104" aka="AAAAAAAAAGg=">
+ <record id="105" aka="AAAAAAAAAGk=">
<pickle>
<tuple>
<tuple>
@@ -16033,22 +17299,13 @@ CREATE TABLE `stock` (\n
<item>
<key> <string>_data</string> </key>
<value>
- <dictionary>
- <item>
- <key> <string>path</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
+ <dictionary/>
</value>
</item>
<item>
<key> <string>_keys</string> </key>
<value>
- <list>
-<string>path</string>
- </list>
+ <list/>
</value>
</item>
</dictionary>
@@ -16064,7 +17321,7 @@ CREATE TABLE `stock` (\n
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>path</string> </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -16090,7 +17347,7 @@ CREATE TABLE `stock` (\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_delete_recorded_object_list</string> </value>
+ <value> <string>z_create_compatibility</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -16102,22 +17359,33 @@ CREATE TABLE `stock` (\n
</item>
<item>
<key> <string>src</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-comment>Do not delete rows really, but just mark them as "played" to avoid dead locks</dtml-comment>\n
-<dtml-if path>\n
-UPDATE\n
- record\n
-SET\n
- played = 1\n
-WHERE\n
-<dtml-in path>\n
- path = <dtml-sqlvar sequence-item type="string"><dtml-if sequence-end><dtml-else> OR </dtml-if>\n
-</dtml-in>\n
-</dtml-if>\n
-
-
-]]></string> </value>
+ <value> <string># Host:\n
+# Database: test\n
+# Table: \'compatibility\'\n
+#\n
+CREATE TABLE `compatibility` (\n
+ `uid` int(11) NOT NULL,\n
+ `Creator` varchar(30) default \'\',\n
+ `Date` datetime default \'0000-00-00 00:00:00\',\n
+ `PrincipiaSearchSource` text,\n
+ `SearchableText` text,\n
+ `EffectiveDate` datetime default \'0000-00-00 00:00:00\',\n
+ `ExpiresDate` datetime default \'0000-00-00 00:00:00\',\n
+ `ModificationDate` datetime default \'0000-00-00 00:00:00\',\n
+ `Type` varchar(30) default \'\',\n
+ `bobobase_modification_time` datetime default \'0000-00-00 00:00:00\',\n
+ `created` datetime default \'0000-00-00 00:00:00\',\n
+ `effective` datetime default \'0000-00-00 00:00:00\',\n
+ `expires` datetime default \'0000-00-00 00:00:00\',\n
+ `getIcon` varchar(30) default \'\',\n
+ `in_reply_to` varchar(255) default \'\',\n
+ `modified` datetime default \'0000-00-00 00:00:00\',\n
+ `review_state` varchar(30) default \'\',\n
+ `summary` text,\n
+ PRIMARY KEY (`uid`),\n
+ KEY `Type` (`Type`),\n
+ KEY `review_state` (`review_state`)\n
+) TYPE=InnoDB;</string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -16151,22 +17419,33 @@ WHERE\n
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-comment>Do not delete rows really, but just mark them as "played" to avoid dead locks</dtml-comment>\n
-<dtml-if path>\n
-UPDATE\n
- record\n
-SET\n
- played = 1\n
-WHERE\n
-<dtml-in path>\n
- path = <dtml-sqlvar sequence-item type="string"><dtml-if sequence-end><dtml-else> OR </dtml-if>\n
-</dtml-in>\n
-</dtml-if>\n
-
-
-]]></string> </value>
+ <value> <string># Host:\n
+# Database: test\n
+# Table: \'compatibility\'\n
+#\n
+CREATE TABLE `compatibility` (\n
+ `uid` int(11) NOT NULL,\n
+ `Creator` varchar(30) default \'\',\n
+ `Date` datetime default \'0000-00-00 00:00:00\',\n
+ `PrincipiaSearchSource` text,\n
+ `SearchableText` text,\n
+ `EffectiveDate` datetime default \'0000-00-00 00:00:00\',\n
+ `ExpiresDate` datetime default \'0000-00-00 00:00:00\',\n
+ `ModificationDate` datetime default \'0000-00-00 00:00:00\',\n
+ `Type` varchar(30) default \'\',\n
+ `bobobase_modification_time` datetime default \'0000-00-00 00:00:00\',\n
+ `created` datetime default \'0000-00-00 00:00:00\',\n
+ `effective` datetime default \'0000-00-00 00:00:00\',\n
+ `expires` datetime default \'0000-00-00 00:00:00\',\n
+ `getIcon` varchar(30) default \'\',\n
+ `in_reply_to` varchar(255) default \'\',\n
+ `modified` datetime default \'0000-00-00 00:00:00\',\n
+ `review_state` varchar(30) default \'\',\n
+ `summary` text,\n
+ PRIMARY KEY (`uid`),\n
+ KEY `Type` (`Type`),\n
+ KEY `review_state` (`review_state`)\n
+) TYPE=InnoDB;</string> </value>
</item>
</dictionary>
</state>
@@ -16180,7 +17459,7 @@ WHERE\n
</dictionary>
</pickle>
</record>
- <record id="105" aka="AAAAAAAAAGk=">
+ <record id="106" aka="AAAAAAAAAGo=">
<pickle>
<tuple>
<tuple>
@@ -16197,7 +17476,7 @@ WHERE\n
<value>
<dictionary>
<item>
- <key> <string>alex</string> </key>
+ <key> <string>jp</string> </key>
<value>
<list>
<string>Owner</string>
@@ -16220,22 +17499,13 @@ WHERE\n
<item>
<key> <string>_data</string> </key>
<value>
- <dictionary>
- <item>
- <key> <string>path</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
+ <dictionary/>
</value>
</item>
<item>
<key> <string>_keys</string> </key>
<value>
- <list>
-<string>path</string>
- </list>
+ <list/>
</value>
</item>
</dictionary>
@@ -16244,56 +17514,53 @@ WHERE\n
</value>
</item>
<item>
- <key> <string>allow_simple_one_argument_traversal</string> </key>
+ <key> <string>_col</string> </key>
<value>
- <none/>
+ <tuple/>
</value>
</item>
<item>
- <key> <string>arguments_src</string> </key>
- <value> <string>path</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>zsqlbrain.py</string> </value>
- </item>
- <item>
- <key> <string>class_name_</string> </key>
- <value> <string>ZSQLBrain</string> </value>
- </item>
- <item>
- <key> <string>connection_hook</string> </key>
+ <key> <string>_owner</string> </key>
<value>
- <none/>
+ <tuple>
+ <list>
+ <string>nexedi</string>
+ <string>acl_users</string>
+ </list>
+<string>jp</string>
+ </tuple>
</value>
</item>
+ <item>
+ <key> <string>arguments_src</string> </key>
+ <value> <string></string> </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_getitem_by_path</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>10</int> </value>
+ <value> <string>z_create_delivery</string> </value>
</item>
<item>
<key> <string>src</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-select * from catalog where <dtml-sqltest path op=eq type="string">
-
-]]></string> </value>
+ <value> <string>CREATE TABLE `delivery` (\n
+ `uid` int(11) default \'0\',\n
+ `source_uid` int(11) default \'0\',\n
+ `destination_uid` int(11) default \'0\',\n
+ `source_section_uid` int(11) default \'0\',\n
+ `destination_section_uid` int(11) default \'0\',\n
+ `resource_uid` int(11) default \'0\',\n
+ `start_date` datetime default NULL,\n
+ `stop_date` datetime default NULL,\n
+ KEY `uid` (`uid`),\n
+ KEY `source_uid` (`source_uid`),\n
+ KEY `destination_uid` (`destination_uid`),\n
+ KEY `source_section_uid` (`source_section_uid`),\n
+ KEY `destination_section_uid` (`destination_section_uid`),\n
+ KEY `resource_uid` (`resource_uid`)\n
+) TYPE=InnoDB</string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -16327,11 +17594,22 @@ select * from catalog where <dtml-sqltest path op=eq type="string">
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-select * from catalog where <dtml-sqltest path op=eq type="string">
-
-]]></string> </value>
+ <value> <string>CREATE TABLE `delivery` (\n
+ `uid` int(11) default \'0\',\n
+ `source_uid` int(11) default \'0\',\n
+ `destination_uid` int(11) default \'0\',\n
+ `source_section_uid` int(11) default \'0\',\n
+ `destination_section_uid` int(11) default \'0\',\n
+ `resource_uid` int(11) default \'0\',\n
+ `start_date` datetime default NULL,\n
+ `stop_date` datetime default NULL,\n
+ KEY `uid` (`uid`),\n
+ KEY `source_uid` (`source_uid`),\n
+ KEY `destination_uid` (`destination_uid`),\n
+ KEY `source_section_uid` (`source_section_uid`),\n
+ KEY `destination_section_uid` (`destination_section_uid`),\n
+ KEY `resource_uid` (`resource_uid`)\n
+) TYPE=InnoDB</string> </value>
</item>
</dictionary>
</state>
@@ -16345,7 +17623,7 @@ select * from catalog where <dtml-sqltest path op=eq type="string">
</dictionary>
</pickle>
</record>
- <record id="106" aka="AAAAAAAAAGo=">
+ <record id="107" aka="AAAAAAAAAGs=">
<pickle>
<tuple>
<tuple>
@@ -16385,22 +17663,13 @@ select * from catalog where <dtml-sqltest path op=eq type="string">
<item>
<key> <string>_data</string> </key>
<value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
+ <dictionary/>
</value>
</item>
<item>
<key> <string>_keys</string> </key>
<value>
- <list>
-<string>uid</string>
- </list>
+ <list/>
</value>
</item>
</dictionary>
@@ -16408,6 +17677,24 @@ select * from catalog where <dtml-sqltest path op=eq type="string">
</object>
</value>
</item>
+ <item>
+ <key> <string>_col</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <tuple>
+ <list>
+ <string>nexedi</string>
+ <string>acl_users</string>
+ </list>
+ <string>jp</string>
+ </tuple>
+ </value>
+ </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -16416,7 +17703,7 @@ select * from catalog where <dtml-sqltest path op=eq type="string">
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>uid</string> </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -16424,11 +17711,11 @@ select * from catalog where <dtml-sqltest path op=eq type="string">
</item>
<item>
<key> <string>class_file_</string> </key>
- <value> <string>zsqlbrain.py</string> </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>class_name_</string> </key>
- <value> <string>ZSQLBrain</string> </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>connection_hook</string> </key>
@@ -16442,23 +17729,37 @@ select * from catalog where <dtml-sqltest path op=eq type="string">
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_getitem_by_uid</string> </value>
+ <value> <string>z_create_item</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
- <value> <int>0</int> </value>
+ <value> <int>100</int> </value>
</item>
<item>
<key> <string>max_rows_</string> </key>
- <value> <int>1</int> </value>
+ <value> <int>1000</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">
-
-]]></string> </value>
+ <value> <string># Host:\n
+# Database: test\n
+# Table: \'item\'\n
+#\n
+CREATE TABLE `item` (\n
+ `uid` int(11) default \'0\',\n
+ `date` datetime,\n
+ `node_uid` int(11) default \'0\',\n
+ `section_uid` int(11) default \'0\',\n
+ `resource_uid` int(11) default \'0\',\n
+ `aggregate_uid` int(11) default \'0\',\n
+ `variation_text` VARCHAR(100),\n
+ KEY `uid` (`uid`),\n
+ KEY `node_uid` (`node_uid`),\n
+ KEY `section_uid` (`section_uid`),\n
+ KEY `resource_uid` (`resource_uid`),\n
+ KEY `variation_text` (`variation_text`)\n
+) TYPE=InnoDB;\n
+</string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -16492,11 +17793,25 @@ select * from catalog where <dtml-sqltest uid op=eq type="int">
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-select * from catalog where <dtml-sqltest uid op=eq type="int">
-
-]]></string> </value>
+ <value> <string># Host:\n
+# Database: test\n
+# Table: \'item\'\n
+#\n
+CREATE TABLE `item` (\n
+ `uid` int(11) default \'0\',\n
+ `date` datetime,\n
+ `node_uid` int(11) default \'0\',\n
+ `section_uid` int(11) default \'0\',\n
+ `resource_uid` int(11) default \'0\',\n
+ `aggregate_uid` int(11) default \'0\',\n
+ `variation_text` VARCHAR(100),\n
+ KEY `uid` (`uid`),\n
+ KEY `node_uid` (`node_uid`),\n
+ KEY `section_uid` (`section_uid`),\n
+ KEY `resource_uid` (`resource_uid`),\n
+ KEY `variation_text` (`variation_text`)\n
+) TYPE=InnoDB;\n
+</string> </value>
</item>
</dictionary>
</state>
@@ -16510,7 +17825,7 @@ select * from catalog where <dtml-sqltest uid op=eq type="int">
</dictionary>
</pickle>
</record>
- <record id="107" aka="AAAAAAAAAGs=">
+ <record id="108" aka="AAAAAAAAAGw=">
<pickle>
<tuple>
<tuple>
@@ -16550,41 +17865,13 @@ select * from catalog where <dtml-sqltest uid op=eq type="int">
<item>
<key> <string>_data</string> </key>
<value>
- <dictionary>
- <item>
- <key> <string>count</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>int</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>thread_id</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
+ <dictionary/>
</value>
</item>
<item>
<key> <string>_keys</string> </key>
<value>
- <list>
-<string>count</string>
-<string>thread_id</string>
-<string>date</string>
- </list>
+ <list/>
</value>
</item>
</dictionary>
@@ -16600,9 +17887,7 @@ select * from catalog where <dtml-sqltest uid op=eq type="int">
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>count:int\n
-thread_id\n
-date</string> </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -16628,42 +17913,55 @@ date</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_produce_reserved_uid_list</string> </value>
+ <value> <string>z_create_movement</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
- <value> <int>0</int> </value>
+ <value> <int>100</int> </value>
</item>
<item>
<key> <string>max_rows_</string> </key>
- <value> <int>10000</int> </value>
+ <value> <int>1000</int> </value>
</item>
<item>
<key> <string>src</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-INSERT INTO\n
- catalog (id, path, CreationDate)\n
-VALUES\n
-<dtml-in "_.range(0,count)">\n
-( <dtml-sqlvar thread_id type="string"> , \'reserved\', <dtml-sqlvar date type="string"> ) ,\n
-</dtml-in>\n
-( <dtml-sqlvar thread_id type="string"> , \'reserved\', <dtml-sqlvar date type="string"> );\n
-\n
-<dtml-var "\'\\0\'">\n
-\n
-SELECT \n
- uid\n
-FROM \n
- catalog \n
-WHERE\n
- path = \'reserved\'\n
-AND\n
- id = <dtml-sqlvar thread_id type="string">\n
-AND\n
- CreationDate = <dtml-sqlvar date type="string">
-
-]]></string> </value>
+ <value> <string># Host:\n
+# Database: test\n
+# Table: \'movement\'\n
+#\n
+CREATE TABLE `movement` (\n
+ `uid` int(11) default \'0\',\n
+ `delivery_uid` int(11) default \'0\',\n
+ `source_uid` int(11) default \'0\',\n
+ `destination_uid` int(11) default \'0\',\n
+ `resource_uid` int(11) default \'0\',\n
+ `quantity` real default \'0.0\',\n
+ `inventory` real default NULL,\n
+ `start_date` datetime,\n
+ `stop_date` datetime,\n
+ `target_quantity` real default \'0.0\',\n
+ `target_start_date` datetime,\n
+ `target_stop_date` datetime,\n
+ `price` real,\n
+ `total_price` real,\n
+ `target_total_price` real,\n
+ `has_cell_content` bool,\n
+ `is_accountable` bool,\n
+ `is_orderable` bool,\n
+ `is_deliverable` bool,\n
+ `variation_text` VARCHAR(100),\n
+ KEY `uid` (`uid`),\n
+ KEY `delivery_uid` (`delivery_uid`),\n
+ KEY `source_uid` (`source_uid`),\n
+ KEY `destination_uid` (`destination_uid`),\n
+ KEY `resource_uid` (`resource_uid`),\n
+ KEY `has_cell_content` (`has_cell_content`),\n
+ KEY `is_accountable` (`is_accountable`),\n
+ KEY `is_orderable` (`is_orderable`),\n
+ KEY `is_deliverable` (`is_deliverable`),\n
+ KEY `variation_text` (`variation_text`)\n
+) TYPE=InnoDB;\n
+</string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -16697,30 +17995,43 @@ AND\n
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-INSERT INTO\n
- catalog (id, path, CreationDate)\n
-VALUES\n
-<dtml-in "_.range(0,count)">\n
-( <dtml-sqlvar thread_id type="string"> , \'reserved\', <dtml-sqlvar date type="string"> ) ,\n
-</dtml-in>\n
-( <dtml-sqlvar thread_id type="string"> , \'reserved\', <dtml-sqlvar date type="string"> );\n
-\n
-<dtml-var "\'\\0\'">\n
-\n
-SELECT \n
- uid\n
-FROM \n
- catalog \n
-WHERE\n
- path = \'reserved\'\n
-AND\n
- id = <dtml-sqlvar thread_id type="string">\n
-AND\n
- CreationDate = <dtml-sqlvar date type="string">
-
-]]></string> </value>
+ <value> <string># Host:\n
+# Database: test\n
+# Table: \'movement\'\n
+#\n
+CREATE TABLE `movement` (\n
+ `uid` int(11) default \'0\',\n
+ `delivery_uid` int(11) default \'0\',\n
+ `source_uid` int(11) default \'0\',\n
+ `destination_uid` int(11) default \'0\',\n
+ `resource_uid` int(11) default \'0\',\n
+ `quantity` real default \'0.0\',\n
+ `inventory` real default NULL,\n
+ `start_date` datetime,\n
+ `stop_date` datetime,\n
+ `target_quantity` real default \'0.0\',\n
+ `target_start_date` datetime,\n
+ `target_stop_date` datetime,\n
+ `price` real,\n
+ `total_price` real,\n
+ `target_total_price` real,\n
+ `has_cell_content` bool,\n
+ `is_accountable` bool,\n
+ `is_orderable` bool,\n
+ `is_deliverable` bool,\n
+ `variation_text` VARCHAR(100),\n
+ KEY `uid` (`uid`),\n
+ KEY `delivery_uid` (`delivery_uid`),\n
+ KEY `source_uid` (`source_uid`),\n
+ KEY `destination_uid` (`destination_uid`),\n
+ KEY `resource_uid` (`resource_uid`),\n
+ KEY `has_cell_content` (`has_cell_content`),\n
+ KEY `is_accountable` (`is_accountable`),\n
+ KEY `is_orderable` (`is_orderable`),\n
+ KEY `is_deliverable` (`is_deliverable`),\n
+ KEY `variation_text` (`variation_text`)\n
+) TYPE=InnoDB;\n
+</string> </value>
</item>
</dictionary>
</state>
@@ -16734,7 +18045,7 @@ AND\n
</dictionary>
</pickle>
</record>
- <record id="108" aka="AAAAAAAAAGw=">
+ <record id="109" aka="AAAAAAAAAG0=">
<pickle>
<tuple>
<tuple>
@@ -16751,7 +18062,7 @@ AND\n
<value>
<dictionary>
<item>
- <key> <string>alex</string> </key>
+ <key> <string>yo</string> </key>
<value>
<list>
<string>Owner</string>
@@ -16789,59 +18100,45 @@ AND\n
</value>
</item>
<item>
- <key> <string>allow_simple_one_argument_traversal</string> </key>
+ <key> <string>_col</string> </key>
<value>
- <none/>
+ <tuple/>
</value>
</item>
<item>
- <key> <string>arguments_src</string> </key>
- <value> <string></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>
+ <key> <string>_owner</string> </key>
+ <value>
+ <tuple>
+ <list>
+ <string>nexedi</string>
+ <string>acl_users</string>
+ </list>
+<string>yo</string>
+ </tuple>
+ </value>
</item>
<item>
- <key> <string>class_name_</string> </key>
+ <key> <string>arguments_src</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_read_recorded_object_list</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>
+ <value> <string>z_create_predicate</string> </value>
</item>
<item>
<key> <string>src</string> </key>
- <value> <string>SELECT\n
- path, catalog\n
-FROM\n
- record\n
-WHERE\n
- played = 0\n
-ORDER BY\n
- path, date DESC</string> </value>
+ <value> <string>CREATE TABLE predicate (\n
+ uid INT,\n
+ `quantity` real ,\n
+ `quantity_min` real ,\n
+ `quantity_max` real ,\n
+ KEY `uid` (`uid`)\n
+) TYPE=InnoDB;\n
+</string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -16875,14 +18172,14 @@ ORDER BY\n
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string>SELECT\n
- path, catalog\n
-FROM\n
- record\n
-WHERE\n
- played = 0\n
-ORDER BY\n
- path, date DESC</string> </value>
+ <value> <string>CREATE TABLE predicate (\n
+ uid INT,\n
+ `quantity` real ,\n
+ `quantity_min` real ,\n
+ `quantity_max` real ,\n
+ KEY `uid` (`uid`)\n
+) TYPE=InnoDB;\n
+</string> </value>
</item>
</dictionary>
</state>
@@ -16896,7 +18193,7 @@ ORDER BY\n
</dictionary>
</pickle>
</record>
- <record id="109" aka="AAAAAAAAAG0=">
+ <record id="110" aka="AAAAAAAAAG4=">
<pickle>
<tuple>
<tuple>
@@ -16913,7 +18210,7 @@ ORDER BY\n
<value>
<dictionary>
<item>
- <key> <string>alex</string> </key>
+ <key> <string>yo</string> </key>
<value>
<list>
<string>Owner</string>
@@ -16936,22 +18233,13 @@ ORDER BY\n
<item>
<key> <string>_data</string> </key>
<value>
- <dictionary>
- <item>
- <key> <string>path</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
+ <dictionary/>
</value>
</item>
<item>
<key> <string>_keys</string> </key>
<value>
- <list>
-<string>path</string>
- </list>
+ <list/>
</value>
</item>
</dictionary>
@@ -16960,64 +18248,47 @@ ORDER BY\n
</value>
</item>
<item>
- <key> <string>allow_simple_one_argument_traversal</string> </key>
+ <key> <string>_col</string> </key>
<value>
- <none/>
+ <tuple/>
</value>
</item>
<item>
- <key> <string>arguments_src</string> </key>
- <value> <string>path</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>
+ <key> <string>_owner</string> </key>
+ <value>
+ <tuple>
+ <list>
+ <string>nexedi</string>
+ <string>acl_users</string>
+ </list>
+<string>yo</string>
+ </tuple>
+ </value>
</item>
<item>
- <key> <string>class_name_</string> </key>
+ <key> <string>arguments_src</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_record_catalog_object</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>
+ <value> <string>z_create_predicate_category</string> </value>
</item>
<item>
<key> <string>src</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-INSERT INTO\n
- record\n
-VALUES\n
-(\n
- <dtml-sqlvar path type="string">,\n
- 1,\n
- 0,\n
- NOW()\n
-)
-
-]]></string> </value>
+ <value> <string>CREATE TABLE `predicate_category` (\n
+ `uid` int(11) default \'0\',\n
+ `category_uid` int(11) default \'0\',\n
+ `base_category_uid` int(11) default \'0\',\n
+ `category_strict_membership` tinyint(1) default \'0\',\n
+ KEY `uid` (`uid`),\n
+ KEY `category_strict_membership` (`category_strict_membership`),\n
+ KEY `Membership` (`category_uid`,`base_category_uid`),\n
+ KEY `FuzzyMembership` (`category_uid`)\n
+) TYPE = InnoDB</string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -17051,19 +18322,16 @@ VALUES\n
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-INSERT INTO\n
- record\n
-VALUES\n
-(\n
- <dtml-sqlvar path type="string">,\n
- 1,\n
- 0,\n
- NOW()\n
-)
-
-]]></string> </value>
+ <value> <string>CREATE TABLE `predicate_category` (\n
+ `uid` int(11) default \'0\',\n
+ `category_uid` int(11) default \'0\',\n
+ `base_category_uid` int(11) default \'0\',\n
+ `category_strict_membership` tinyint(1) default \'0\',\n
+ KEY `uid` (`uid`),\n
+ KEY `category_strict_membership` (`category_strict_membership`),\n
+ KEY `Membership` (`category_uid`,`base_category_uid`),\n
+ KEY `FuzzyMembership` (`category_uid`)\n
+) TYPE = InnoDB</string> </value>
</item>
</dictionary>
</state>
@@ -17077,7 +18345,7 @@ VALUES\n
</dictionary>
</pickle>
</record>
- <record id="110" aka="AAAAAAAAAG4=">
+ <record id="111" aka="AAAAAAAAAG8=">
<pickle>
<tuple>
<tuple>
@@ -17117,22 +18385,13 @@ VALUES\n
<item>
<key> <string>_data</string> </key>
<value>
- <dictionary>
- <item>
- <key> <string>path</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
+ <dictionary/>
</value>
</item>
<item>
<key> <string>_keys</string> </key>
<value>
- <list>
-<string>path</string>
- </list>
+ <list/>
</value>
</item>
</dictionary>
@@ -17148,7 +18407,7 @@ VALUES\n
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>path</string> </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -17174,7 +18433,7 @@ VALUES\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_record_uncatalog_object</string> </value>
+ <value> <string>z_create_roles_and_users</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -17186,19 +18445,12 @@ VALUES\n
</item>
<item>
<key> <string>src</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-INSERT INTO\n
- record\n
-VALUES\n
-(\n
- <dtml-sqlvar path type="string">,\n
- 0,\n
- 0,\n
- NOW()\n
-)
-
-]]></string> </value>
+ <value> <string>CREATE TABLE roles_and_users (\n
+ uid INT,\n
+ allowedRolesAndUsers VARCHAR(40),\n
+ KEY `uid` (`uid`),\n
+ KEY `allowedRolesAndUsers` (`allowedRolesAndUsers`)\n
+) TYPE=InnoDB; </string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -17232,19 +18484,12 @@ VALUES\n
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-INSERT INTO\n
- record\n
-VALUES\n
-(\n
- <dtml-sqlvar path type="string">,\n
- 0,\n
- 0,\n
- NOW()\n
-)
-
-]]></string> </value>
+ <value> <string>CREATE TABLE roles_and_users (\n
+ uid INT,\n
+ allowedRolesAndUsers VARCHAR(40),\n
+ KEY `uid` (`uid`),\n
+ KEY `allowedRolesAndUsers` (`allowedRolesAndUsers`)\n
+) TYPE=InnoDB; </string> </value>
</item>
</dictionary>
</state>
@@ -17258,7 +18503,7 @@ VALUES\n
</dictionary>
</pickle>
</record>
- <record id="111" aka="AAAAAAAAAG8=">
+ <record id="112" aka="AAAAAAAAAHA=">
<pickle>
<tuple>
<tuple>
@@ -17298,22 +18543,13 @@ VALUES\n
<item>
<key> <string>_data</string> </key>
<value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
+ <dictionary/>
</value>
</item>
<item>
<key> <string>_keys</string> </key>
<value>
- <list>
-<string>table_0</string>
- </list>
+ <list/>
</value>
</item>
</dictionary>
@@ -17321,9 +18557,39 @@ VALUES\n
</object>
</value>
</item>
+ <item>
+ <key> <string>_col</string> </key>
+ <value>
+ <tuple/>
+ </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</string> </value>
+ <value> <string></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>
@@ -17331,15 +18597,48 @@ VALUES\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_related_mirror_section_uid_from_stock</string> </value>
+ <value> <string>z_create_stock</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>.uid = stock.mirror_section_uid
-
-]]></string> </value>
+ <value> <string># Host:\n
+# Database: test\n
+# Table: \'stock\'\n
+#\n
+CREATE TABLE `stock` (\n
+ `uid` int(11) NOT NULL default \'0\',\n
+ `node_uid` int(11),\n
+ `section_uid` int(11),\n
+ `payment_uid` int(11),\n
+ `mirror_section_uid` int(11),\n
+ `resource_uid` int(11),\n
+ `quantity` real ,\n
+ `date` datetime,\n
+ `price` real ,\n
+ `is_accountable` bool,\n
+ `portal_type` VARCHAR(30),\n
+ `simulation_state` varchar(30) default \'\',\n
+ `variation_text` VARCHAR(100),\n
+ KEY `uid` (`uid`),\n
+ KEY `quantity` (`quantity`),\n
+ KEY `section_uid` (`section_uid`),\n
+ KEY `mirror_section_uid` (`mirror_section_uid`),\n
+ KEY `node_uid` (`node_uid`),\n
+ KEY `payment_uid` (`payment_uid`),\n
+ KEY `resource_uid` (`resource_uid`),\n
+ KEY `simulation_state` (`simulation_state`),\n
+ KEY `resource_node_uid` (`resource_uid`, `node_uid`),\n
+ KEY `resource_section_node_uid` (`resource_uid`, `section_uid`, `node_uid`, `simulation_state`)\n
+) TYPE = InnoDB;\n
+</string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -17371,14 +18670,39 @@ VALUES\n
<dictionary/>
</value>
</item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = stock.mirror_section_uid
-
-]]></string> </value>
- </item>
+ <item>
+ <key> <string>raw</string> </key>
+ <value> <string># Host:\n
+# Database: test\n
+# Table: \'stock\'\n
+#\n
+CREATE TABLE `stock` (\n
+ `uid` int(11) NOT NULL default \'0\',\n
+ `node_uid` int(11),\n
+ `section_uid` int(11),\n
+ `payment_uid` int(11),\n
+ `mirror_section_uid` int(11),\n
+ `resource_uid` int(11),\n
+ `quantity` real ,\n
+ `date` datetime,\n
+ `price` real ,\n
+ `is_accountable` bool,\n
+ `portal_type` VARCHAR(30),\n
+ `simulation_state` varchar(30) default \'\',\n
+ `variation_text` VARCHAR(100),\n
+ KEY `uid` (`uid`),\n
+ KEY `quantity` (`quantity`),\n
+ KEY `section_uid` (`section_uid`),\n
+ KEY `mirror_section_uid` (`mirror_section_uid`),\n
+ KEY `node_uid` (`node_uid`),\n
+ KEY `payment_uid` (`payment_uid`),\n
+ KEY `resource_uid` (`resource_uid`),\n
+ KEY `simulation_state` (`simulation_state`),\n
+ KEY `resource_node_uid` (`resource_uid`, `node_uid`),\n
+ KEY `resource_section_node_uid` (`resource_uid`, `section_uid`, `node_uid`, `simulation_state`)\n
+) TYPE = InnoDB;\n
+</string> </value>
+ </item>
</dictionary>
</state>
</object>
@@ -17391,7 +18715,7 @@ VALUES\n
</dictionary>
</pickle>
</record>
- <record id="112" aka="AAAAAAAAAHA=">
+ <record id="113" aka="AAAAAAAAAHE=">
<pickle>
<tuple>
<tuple>
@@ -17431,22 +18755,13 @@ VALUES\n
<item>
<key> <string>_data</string> </key>
<value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
+ <dictionary/>
</value>
</item>
<item>
<key> <string>_keys</string> </key>
<value>
- <list>
-<string>table_0</string>
- </list>
+ <list/>
</value>
</item>
</dictionary>
@@ -17454,9 +18769,33 @@ VALUES\n
</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</string> </value>
+ <value> <string></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>
@@ -17464,15 +18803,24 @@ VALUES\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_related_node_uid_from_stock</string> </value>
+ <value> <string>z_create_subject</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>.uid = stock.node_uid
-
-]]></string> </value>
+ <value> <string>CREATE TABLE subject (\n
+ uid INT,\n
+ subject VARCHAR(255),\n
+ KEY `uid` (`uid`),\n
+ KEY `allowedRolesAndUsers` (`Subject`)\n
+) TYPE=InnoDB; </string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -17506,11 +18854,12 @@ VALUES\n
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = stock.node_uid
-
-]]></string> </value>
+ <value> <string>CREATE TABLE subject (\n
+ uid INT,\n
+ subject VARCHAR(255),\n
+ KEY `uid` (`uid`),\n
+ KEY `allowedRolesAndUsers` (`Subject`)\n
+) TYPE=InnoDB; </string> </value>
</item>
</dictionary>
</state>
@@ -17524,7 +18873,7 @@ VALUES\n
</dictionary>
</pickle>
</record>
- <record id="113" aka="AAAAAAAAAHE=">
+ <record id="114" aka="AAAAAAAAAHI=">
<pickle>
<tuple>
<tuple>
@@ -17597,13 +18946,13 @@ VALUES\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_related_payment_uid_from_stock</string> </value>
+ <value> <string>z_related_mirror_section_uid_from_stock</string> </value>
</item>
<item>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-var table_0>.uid = stock.payment_uid
+<dtml-var table_0>.uid = stock.mirror_section_uid
]]></string> </value>
</item>
@@ -17641,7 +18990,7 @@ VALUES\n
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-var table_0>.uid = stock.payment_uid
+<dtml-var table_0>.uid = stock.mirror_section_uid
]]></string> </value>
</item>
@@ -17657,7 +19006,7 @@ VALUES\n
</dictionary>
</pickle>
</record>
- <record id="114" aka="AAAAAAAAAHI=">
+ <record id="115" aka="AAAAAAAAAHM=">
<pickle>
<tuple>
<tuple>
@@ -17704,12 +19053,6 @@ VALUES\n
<dictionary/>
</value>
</item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
</dictionary>
</value>
</item>
@@ -17718,7 +19061,6 @@ VALUES\n
<value>
<list>
<string>table_0</string>
-<string>table_1</string>
</list>
</value>
</item>
@@ -17729,23 +19071,21 @@ VALUES\n
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>table_0\r\n
-table_1</string> </value>
+ <value> <string>table_0</string> </value>
</item>
<item>
<key> <string>connection_id</string> </key>
- <value> <string>cmf_activity_sql_connection</string> </value>
+ <value> <string>erp5_sql_connection</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_related_resource</string> </value>
+ <value> <string>z_related_node_uid_from_stock</string> </value>
</item>
<item>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-var table_0>.uid = catalog.uid\n
- AND <dtml-var table_1>.uid = <dtml-var table_0>.resource_uid
+<dtml-var table_0>.uid = stock.node_uid
]]></string> </value>
</item>
@@ -17783,8 +19123,7 @@ table_1</string> </value>
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-var table_0>.uid = catalog.uid\n
- AND <dtml-var table_1>.uid = <dtml-var table_0>.resource_uid
+<dtml-var table_0>.uid = stock.node_uid
]]></string> </value>
</item>
@@ -17800,7 +19139,7 @@ table_1</string> </value>
</dictionary>
</pickle>
</record>
- <record id="115" aka="AAAAAAAAAHM=">
+ <record id="116" aka="AAAAAAAAAHQ=">
<pickle>
<tuple>
<tuple>
@@ -17873,13 +19212,13 @@ table_1</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_related_resource_uid_from_stock</string> </value>
+ <value> <string>z_related_payment_uid_from_stock</string> </value>
</item>
<item>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-var table_0>.uid = stock.resource_uid
+<dtml-var table_0>.uid = stock.payment_uid
]]></string> </value>
</item>
@@ -17917,7 +19256,7 @@ table_1</string> </value>
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-var table_0>.uid = stock.resource_uid
+<dtml-var table_0>.uid = stock.payment_uid
]]></string> </value>
</item>
@@ -17933,7 +19272,7 @@ table_1</string> </value>
</dictionary>
</pickle>
</record>
- <record id="116" aka="AAAAAAAAAHQ=">
+ <record id="117" aka="AAAAAAAAAHU=">
<pickle>
<tuple>
<tuple>
@@ -17950,7 +19289,7 @@ table_1</string> </value>
<value>
<dictionary>
<item>
- <key> <string>alex</string> </key>
+ <key> <string>yo</string> </key>
<value>
<list>
<string>Owner</string>
@@ -17996,6 +19335,18 @@ table_1</string> </value>
</object>
</value>
</item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <tuple>
+ <list>
+ <string>nexedi</string>
+ <string>acl_users</string>
+ </list>
+<string>yo</string>
+ </tuple>
+ </value>
+ </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>table_0</string> </value>
@@ -18006,13 +19357,13 @@ table_1</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_related_section_uid_from_stock</string> </value>
+ <value> <string>z_related_predicate</string> </value>
</item>
<item>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-var table_0>.uid = stock.section_uid
+<dtml-var table_0>.uid = catalog.uid
]]></string> </value>
</item>
@@ -18050,7 +19401,7 @@ table_1</string> </value>
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-var table_0>.uid = stock.section_uid
+<dtml-var table_0>.uid = catalog.uid
]]></string> </value>
</item>
@@ -18066,7 +19417,7 @@ table_1</string> </value>
</dictionary>
</pickle>
</record>
- <record id="117" aka="AAAAAAAAAHU=">
+ <record id="118" aka="AAAAAAAAAHY=">
<pickle>
<tuple>
<tuple>
@@ -18113,6 +19464,12 @@ table_1</string> </value>
<dictionary/>
</value>
</item>
+ <item>
+ <key> <string>table_1</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
</dictionary>
</value>
</item>
@@ -18121,6 +19478,7 @@ table_1</string> </value>
<value>
<list>
<string>table_0</string>
+<string>table_1</string>
</list>
</value>
</item>
@@ -18129,55 +19487,25 @@ table_1</string> </value>
</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</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>
+ <value> <string>table_0\r\n
+table_1</string> </value>
</item>
<item>
<key> <string>connection_id</string> </key>
- <value> <string>erp5_sql_connection</string> </value>
+ <value> <string>cmf_activity_sql_connection</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_related_security</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>
+ <value> <string>z_related_resource</string> </value>
</item>
<item>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-var table_0>.uid = catalog.security_uid
+<dtml-var table_0>.uid = catalog.uid\n
+ AND <dtml-var table_1>.uid = <dtml-var table_0>.resource_uid
]]></string> </value>
</item>
@@ -18215,7 +19543,8 @@ table_1</string> </value>
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-var table_0>.uid = catalog.security_uid
+<dtml-var table_0>.uid = catalog.uid\n
+ AND <dtml-var table_1>.uid = <dtml-var table_0>.resource_uid
]]></string> </value>
</item>
@@ -18231,7 +19560,7 @@ table_1</string> </value>
</dictionary>
</pickle>
</record>
- <record id="118" aka="AAAAAAAAAHY=">
+ <record id="119" aka="AAAAAAAAAHc=">
<pickle>
<tuple>
<tuple>
@@ -18304,13 +19633,13 @@ table_1</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_related_uid</string> </value>
+ <value> <string>z_related_resource_uid_from_stock</string> </value>
</item>
<item>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-var table_0>.uid = catalog.uid
+<dtml-var table_0>.uid = stock.resource_uid
]]></string> </value>
</item>
@@ -18348,7 +19677,7 @@ table_1</string> </value>
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-var table_0>.uid = catalog.uid
+<dtml-var table_0>.uid = stock.resource_uid
]]></string> </value>
</item>
@@ -18364,7 +19693,7 @@ table_1</string> </value>
</dictionary>
</pickle>
</record>
- <record id="119" aka="AAAAAAAAAHc=">
+ <record id="120" aka="AAAAAAAAAHg=">
<pickle>
<tuple>
<tuple>
@@ -18406,19 +19735,7 @@ table_1</string> </value>
<value>
<dictionary>
<item>
- <key> <string>parent_uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>query</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>sort_on</string> </key>
+ <key> <string>table_0</string> </key>
<value>
<dictionary/>
</value>
@@ -18430,46 +19747,18 @@ table_1</string> </value>
<key> <string>_keys</string> </key>
<value>
<list>
-<string>sort_on</string>
-<string>query</string>
-<string>parent_uid</string>
+<string>table_0</string>
</list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>allow_simple_one_argument_traversal</string> </key>
- <value>
- <none/>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
</value>
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>sort_on\r\n
-query\r\n
-parent_uid</string> </value>
- </item>
- <item>
- <key> <string>cache_time_</string> </key>
- <value> <int>10</int> </value>
- </item>
- <item>
- <key> <string>class_file_</string> </key>
- <value> <string>zsqlbrain.py</string> </value>
- </item>
- <item>
- <key> <string>class_name_</string> </key>
- <value> <string>ZSQLBrain</string> </value>
- </item>
- <item>
- <key> <string>connection_hook</string> </key>
- <value>
- <none/>
- </value>
+ <value> <string>table_0</string> </value>
</item>
<item>
<key> <string>connection_id</string> </key>
@@ -18477,33 +19766,13 @@ parent_uid</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_search_folder</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>
+ <value> <string>z_related_section_uid_from_stock</string> </value>
</item>
<item>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-if sort_on>\n
-<dtml-if query>\n
-SELECT DISTINCT catalog.* FROM catalog, category, roles_and_users WHERE catalog.uid=category.uid AND catalog.uid=roles_and_users.uid AND <dtml-var query> AND <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int> ORDER BY <dtml-var sort_on>\n
-<dtml-else>\n
-SELECT * FROM catalog WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int> ORDER BY <dtml-var sort_on>\n
-</dtml-if>\n
-<dtml-else>\n
-<dtml-if query>\n
-SELECT DISTINCT catalog.* FROM catalog, category, roles_and_users WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int> AND catalog.uid=category.uid AND catalog.uid=roles_and_users.uid AND <dtml-var query>\n
-<dtml-else>\n
-SELECT * FROM catalog WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int>\n
-</dtml-if>\n
-</dtml-if>
+<dtml-var table_0>.uid = stock.section_uid
]]></string> </value>
</item>
@@ -18541,19 +19810,7 @@ SELECT * FROM catalog WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-if sort_on>\n
-<dtml-if query>\n
-SELECT DISTINCT catalog.* FROM catalog, category, roles_and_users WHERE catalog.uid=category.uid AND catalog.uid=roles_and_users.uid AND <dtml-var query> AND <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int> ORDER BY <dtml-var sort_on>\n
-<dtml-else>\n
-SELECT * FROM catalog WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int> ORDER BY <dtml-var sort_on>\n
-</dtml-if>\n
-<dtml-else>\n
-<dtml-if query>\n
-SELECT DISTINCT catalog.* FROM catalog, category, roles_and_users WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int> AND catalog.uid=category.uid AND catalog.uid=roles_and_users.uid AND <dtml-var query>\n
-<dtml-else>\n
-SELECT * FROM catalog WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int>\n
-</dtml-if>\n
-</dtml-if>
+<dtml-var table_0>.uid = stock.section_uid
]]></string> </value>
</item>
@@ -18569,7 +19826,7 @@ SELECT * FROM catalog WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent
</dictionary>
</pickle>
</record>
- <record id="120" aka="AAAAAAAAAHg=">
+ <record id="121" aka="AAAAAAAAAHk=">
<pickle>
<tuple>
<tuple>
@@ -18611,48 +19868,7 @@ SELECT * FROM catalog WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent
<value>
<dictionary>
<item>
- <key> <string>from_table_list</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>select_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>selection</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>selection_domain</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>selection_report</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>sort_on</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>where_expression</string> </key>
+ <key> <string>table_0</string> </key>
<value>
<dictionary/>
</value>
@@ -18664,13 +19880,7 @@ SELECT * FROM catalog WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent
<key> <string>_keys</string> </key>
<value>
<list>
-<string>selection</string>
-<string>selection_domain</string>
-<string>selection_report</string>
-<string>where_expression</string>
-<string>select_expression</string>
-<string>from_table_list</string>
-<string>sort_on</string>
+<string>table_0</string>
</list>
</value>
</item>
@@ -18687,13 +19897,7 @@ SELECT * FROM catalog WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>selection\r\n
-selection_domain\r\n
-selection_report\r\n
-where_expression\r\n
-select_expression\r\n
-from_table_list:list\r\n
-sort_on</string> </value>
+ <value> <string>table_0</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -18701,11 +19905,11 @@ sort_on</string> </value>
</item>
<item>
<key> <string>class_file_</string> </key>
- <value> <string>zsqlbrain.py</string> </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>class_name_</string> </key>
- <value> <string>ZSQLBrain</string> </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>connection_hook</string> </key>
@@ -18719,7 +19923,7 @@ sort_on</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_search_results</string> </value>
+ <value> <string>z_related_security</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -18727,36 +19931,13 @@ sort_on</string> </value>
</item>
<item>
<key> <string>max_rows_</string> </key>
- <value> <int>500</int> </value>
+ <value> <int>1000</int> </value>
</item>
<item>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-SELECT DISTINCT\n
- <dtml-in getCatalogSearchResultKeys> <dtml-var sequence-item><dtml-if sequence-end> <dtml-else>, </dtml-if> </dtml-in>\n
-\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 selection_domain><dtml-if "selection_domain.asSqlJoinExpression()">, <dtml-var "selection_domain.asSqlJoinExpression()"></dtml-if> </dtml-if>\n
- <dtml-if selection_report><dtml-if "selection_report.asSqlJoinExpression()">, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if></dtml-if>\n
-\n
-WHERE \n
- 1 = 1 \n
-<dtml-if where_expression>\n
- AND <dtml-var where_expression>\n
-</dtml-if>\n
-<dtml-if selection_domain>\n
- AND <dtml-var "selection_domain.asSqlExpression()">\n
-</dtml-if>\n
-<dtml-if selection_report>\n
- AND <dtml-var "selection_report.asSqlExpression(strict_membership=1)">\n
-</dtml-if>\n
-<dtml-if sort_on>\n
-ORDER BY\n
- <dtml-var sort_on>\n
-</dtml-if>\n
-
+<dtml-var table_0>.uid = catalog.security_uid
]]></string> </value>
</item>
@@ -18794,30 +19975,7 @@ ORDER BY\n
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-SELECT DISTINCT\n
- <dtml-in getCatalogSearchResultKeys> <dtml-var sequence-item><dtml-if sequence-end> <dtml-else>, </dtml-if> </dtml-in>\n
-\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 selection_domain><dtml-if "selection_domain.asSqlJoinExpression()">, <dtml-var "selection_domain.asSqlJoinExpression()"></dtml-if> </dtml-if>\n
- <dtml-if selection_report><dtml-if "selection_report.asSqlJoinExpression()">, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if></dtml-if>\n
-\n
-WHERE \n
- 1 = 1 \n
-<dtml-if where_expression>\n
- AND <dtml-var where_expression>\n
-</dtml-if>\n
-<dtml-if selection_domain>\n
- AND <dtml-var "selection_domain.asSqlExpression()">\n
-</dtml-if>\n
-<dtml-if selection_report>\n
- AND <dtml-var "selection_report.asSqlExpression(strict_membership=1)">\n
-</dtml-if>\n
-<dtml-if sort_on>\n
-ORDER BY\n
- <dtml-var sort_on>\n
-</dtml-if>\n
-
+<dtml-var table_0>.uid = catalog.security_uid
]]></string> </value>
</item>
@@ -18833,7 +19991,7 @@ ORDER BY\n
</dictionary>
</pickle>
</record>
- <record id="121" aka="AAAAAAAAAHk=">
+ <record id="122" aka="AAAAAAAAAHo=">
<pickle>
<tuple>
<tuple>
@@ -18873,13 +20031,22 @@ ORDER BY\n
<item>
<key> <string>_data</string> </key>
<value>
- <dictionary/>
+ <dictionary>
+ <item>
+ <key> <string>table_0</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ </dictionary>
</value>
</item>
<item>
<key> <string>_keys</string> </key>
<value>
- <list/>
+ <list>
+<string>table_0</string>
+ </list>
</value>
</item>
</dictionary>
@@ -18887,33 +20054,9 @@ ORDER BY\n
</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></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>
+ <value> <string>table_0</string> </value>
</item>
<item>
<key> <string>connection_id</string> </key>
@@ -18921,19 +20064,15 @@ ORDER BY\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_show_category_columns</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>
+ <value> <string>z_related_uid</string> </value>
</item>
<item>
<key> <string>src</string> </key>
- <value> <string>show columns from category</string> </value>
+ <value> <string encoding="cdata"><![CDATA[
+
+<dtml-var table_0>.uid = catalog.uid
+
+]]></string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -18967,7 +20106,11 @@ ORDER BY\n
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string>show columns from category</string> </value>
+ <value> <string encoding="cdata"><![CDATA[
+
+<dtml-var table_0>.uid = catalog.uid
+
+]]></string> </value>
</item>
</dictionary>
</state>
@@ -18981,7 +20124,7 @@ ORDER BY\n
</dictionary>
</pickle>
</record>
- <record id="122" aka="AAAAAAAAAHo=">
+ <record id="123" aka="AAAAAAAAAHs=">
<pickle>
<tuple>
<tuple>
@@ -19023,7 +20166,19 @@ ORDER BY\n
<value>
<dictionary>
<item>
- <key> <string>table</string> </key>
+ <key> <string>parent_uid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>query</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>sort_on</string> </key>
<value>
<dictionary/>
</value>
@@ -19035,7 +20190,9 @@ ORDER BY\n
<key> <string>_keys</string> </key>
<value>
<list>
-<string>table</string>
+<string>sort_on</string>
+<string>query</string>
+<string>parent_uid</string>
</list>
</value>
</item>
@@ -19052,19 +20209,21 @@ ORDER BY\n
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>table</string> </value>
+ <value> <string>sort_on\r\n
+query\r\n
+parent_uid</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
- <value> <int>0</int> </value>
+ <value> <int>10</int> </value>
</item>
<item>
<key> <string>class_file_</string> </key>
- <value> <string></string> </value>
+ <value> <string>zsqlbrain.py</string> </value>
</item>
<item>
<key> <string>class_name_</string> </key>
- <value> <string></string> </value>
+ <value> <string>ZSQLBrain</string> </value>
</item>
<item>
<key> <string>connection_hook</string> </key>
@@ -19078,7 +20237,7 @@ ORDER BY\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_show_columns</string> </value>
+ <value> <string>z_search_folder</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -19092,7 +20251,19 @@ ORDER BY\n
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-show columns from <dtml-var table>
+<dtml-if sort_on>\n
+<dtml-if query>\n
+SELECT DISTINCT catalog.* FROM catalog, category, roles_and_users WHERE catalog.uid=category.uid AND catalog.uid=roles_and_users.uid AND <dtml-var query> AND <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int> ORDER BY <dtml-var sort_on>\n
+<dtml-else>\n
+SELECT * FROM catalog WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int> ORDER BY <dtml-var sort_on>\n
+</dtml-if>\n
+<dtml-else>\n
+<dtml-if query>\n
+SELECT DISTINCT catalog.* FROM catalog, category, roles_and_users WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int> AND catalog.uid=category.uid AND catalog.uid=roles_and_users.uid AND <dtml-var query>\n
+<dtml-else>\n
+SELECT * FROM catalog WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int>\n
+</dtml-if>\n
+</dtml-if>
]]></string> </value>
</item>
@@ -19130,7 +20301,19 @@ show columns from <dtml-var table>
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-show columns from <dtml-var table>
+<dtml-if sort_on>\n
+<dtml-if query>\n
+SELECT DISTINCT catalog.* FROM catalog, category, roles_and_users WHERE catalog.uid=category.uid AND catalog.uid=roles_and_users.uid AND <dtml-var query> AND <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int> ORDER BY <dtml-var sort_on>\n
+<dtml-else>\n
+SELECT * FROM catalog WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int> ORDER BY <dtml-var sort_on>\n
+</dtml-if>\n
+<dtml-else>\n
+<dtml-if query>\n
+SELECT DISTINCT catalog.* FROM catalog, category, roles_and_users WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int> AND catalog.uid=category.uid AND catalog.uid=roles_and_users.uid AND <dtml-var query>\n
+<dtml-else>\n
+SELECT * FROM catalog WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int>\n
+</dtml-if>\n
+</dtml-if>
]]></string> </value>
</item>
@@ -19146,7 +20329,7 @@ show columns from <dtml-var table>
</dictionary>
</pickle>
</record>
- <record id="123" aka="AAAAAAAAAHs=">
+ <record id="124" aka="AAAAAAAAAHw=">
<pickle>
<tuple>
<tuple>
@@ -19188,7 +20371,54 @@ show columns from <dtml-var table>
<value>
<dictionary>
<item>
- <key> <string>table</string> </key>
+ <key> <string>from_table_list</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>type</string> </key>
+ <value> <string>list</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>limit_expression</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>select_expression</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>selection</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>selection_domain</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>selection_report</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>sort_on</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>where_expression</string> </key>
<value>
<dictionary/>
</value>
@@ -19200,7 +20430,14 @@ show columns from <dtml-var table>
<key> <string>_keys</string> </key>
<value>
<list>
-<string>table</string>
+<string>selection</string>
+<string>selection_domain</string>
+<string>selection_report</string>
+<string>where_expression</string>
+<string>select_expression</string>
+<string>from_table_list</string>
+<string>sort_on</string>
+<string>limit_expression</string>
</list>
</value>
</item>
@@ -19217,7 +20454,14 @@ show columns from <dtml-var table>
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>table</string> </value>
+ <value> <string>selection\r\n
+selection_domain\r\n
+selection_report\r\n
+where_expression\r\n
+select_expression\r\n
+from_table_list:list\r\n
+sort_on\r\n
+limit_expression</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -19225,17 +20469,15 @@ show columns from <dtml-var table>
</item>
<item>
<key> <string>class_file_</string> </key>
- <value> <string></string> </value>
+ <value> <string>zsqlbrain.py</string> </value>
</item>
<item>
<key> <string>class_name_</string> </key>
- <value> <string></string> </value>
+ <value> <string>ZSQLBrain</string> </value>
</item>
<item>
<key> <string>connection_hook</string> </key>
- <value>
- <none/>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>connection_id</string> </key>
@@ -19243,7 +20485,7 @@ show columns from <dtml-var table>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_show_tables</string> </value>
+ <value> <string>z_search_results</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -19251,12 +20493,43 @@ show columns from <dtml-var table>
</item>
<item>
<key> <string>max_rows_</string> </key>
- <value> <int>1000</int> </value>
+ <value> <int>0</int> </value>
</item>
<item>
<key> <string>src</string> </key>
- <value> <string>show tables\n
-</string> </value>
+ <value> <string encoding="cdata"><![CDATA[
+
+SELECT DISTINCT\n
+ <dtml-in getCatalogSearchResultKeys> <dtml-var sequence-item><dtml-if sequence-end> <dtml-else>, </dtml-if> </dtml-in>\n
+\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 selection_domain><dtml-if "selection_domain.asSqlJoinExpression()">, <dtml-var "selection_domain.asSqlJoinExpression()"></dtml-if> </dtml-if>\n
+ <dtml-if selection_report><dtml-if "selection_report.asSqlJoinExpression()">, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if></dtml-if>\n
+\n
+WHERE \n
+ 1 = 1 \n
+<dtml-if where_expression>\n
+ AND <dtml-var where_expression>\n
+</dtml-if>\n
+<dtml-if selection_domain>\n
+ AND <dtml-var "selection_domain.asSqlExpression()">\n
+</dtml-if>\n
+<dtml-if selection_report>\n
+ AND <dtml-var "selection_report.asSqlExpression(strict_membership=1)">\n
+</dtml-if>\n
+<dtml-if sort_on>\n
+ORDER BY\n
+ <dtml-var sort_on>\n
+</dtml-if>\n
+<dtml-if limit_expression>\n
+LIMIT <dtml-var "limit_expression">\n
+<dtml-else>\n
+LIMIT 1000\n
+</dtml-if>\n
+
+
+]]></string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -19290,8 +20563,39 @@ show columns from <dtml-var table>
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string>show tables\n
-</string> </value>
+ <value> <string encoding="cdata"><![CDATA[
+
+SELECT DISTINCT\n
+ <dtml-in getCatalogSearchResultKeys> <dtml-var sequence-item><dtml-if sequence-end> <dtml-else>, </dtml-if> </dtml-in>\n
+\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 selection_domain><dtml-if "selection_domain.asSqlJoinExpression()">, <dtml-var "selection_domain.asSqlJoinExpression()"></dtml-if> </dtml-if>\n
+ <dtml-if selection_report><dtml-if "selection_report.asSqlJoinExpression()">, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if></dtml-if>\n
+\n
+WHERE \n
+ 1 = 1 \n
+<dtml-if where_expression>\n
+ AND <dtml-var where_expression>\n
+</dtml-if>\n
+<dtml-if selection_domain>\n
+ AND <dtml-var "selection_domain.asSqlExpression()">\n
+</dtml-if>\n
+<dtml-if selection_report>\n
+ AND <dtml-var "selection_report.asSqlExpression(strict_membership=1)">\n
+</dtml-if>\n
+<dtml-if sort_on>\n
+ORDER BY\n
+ <dtml-var sort_on>\n
+</dtml-if>\n
+<dtml-if limit_expression>\n
+LIMIT <dtml-var "limit_expression">\n
+<dtml-else>\n
+LIMIT 1000\n
+</dtml-if>\n
+
+
+]]></string> </value>
</item>
</dictionary>
</state>
@@ -19305,7 +20609,7 @@ show columns from <dtml-var table>
</dictionary>
</pickle>
</record>
- <record id="124" aka="AAAAAAAAAHw=">
+ <record id="125" aka="AAAAAAAAAH0=">
<pickle>
<tuple>
<tuple>
@@ -19345,22 +20649,13 @@ show columns from <dtml-var table>
<item>
<key> <string>_data</string> </key>
<value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
+ <dictionary/>
</value>
</item>
<item>
<key> <string>_keys</string> </key>
<value>
- <list>
-<string>uid</string>
- </list>
+ <list/>
</value>
</item>
</dictionary>
@@ -19368,18 +20663,6 @@ show columns from <dtml-var table>
</object>
</value>
</item>
- <item>
- <key> <string>_owner</string> </key>
- <value>
- <tuple>
- <list>
- <string>nexedi</string>
- <string>acl_users</string>
- </list>
- <string>jp</string>
- </tuple>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -19388,7 +20671,7 @@ show columns from <dtml-var table>
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>uid</string> </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -19414,7 +20697,7 @@ show columns from <dtml-var table>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_uncatalog_delivery</string> </value>
+ <value> <string>z_show_category_columns</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -19426,11 +20709,7 @@ show columns from <dtml-var table>
</item>
<item>
<key> <string>src</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM delivery WHERE <dtml-sqltest uid op=eq type=int>
-
-]]></string> </value>
+ <value> <string>show columns from category</string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -19464,11 +20743,7 @@ DELETE FROM delivery WHERE <dtml-sqltest uid op=eq type=int>
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM delivery WHERE <dtml-sqltest uid op=eq type=int>
-
-]]></string> </value>
+ <value> <string>show columns from category</string> </value>
</item>
</dictionary>
</state>
@@ -19482,7 +20757,7 @@ DELETE FROM delivery WHERE <dtml-sqltest uid op=eq type=int>
</dictionary>
</pickle>
</record>
- <record id="125" aka="AAAAAAAAAH0=">
+ <record id="126" aka="AAAAAAAAAH4=">
<pickle>
<tuple>
<tuple>
@@ -19545,6 +20820,18 @@ DELETE FROM delivery WHERE <dtml-sqltest uid op=eq type=int>
</object>
</value>
</item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <tuple>
+ <list>
+ <string>nexedi</string>
+ <string>acl_users</string>
+ </list>
+ <string>jp</string>
+ </tuple>
+ </value>
+ </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -19579,7 +20866,7 @@ DELETE FROM delivery WHERE <dtml-sqltest uid op=eq type=int>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_uncatalog_object</string> </value>
+ <value> <string>z_uncatalog_delivery</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -19593,7 +20880,7 @@ DELETE FROM delivery WHERE <dtml-sqltest uid op=eq type=int>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-DELETE FROM catalog WHERE <dtml-sqltest uid op=eq type=int>
+DELETE FROM delivery WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
@@ -19631,7 +20918,7 @@ DELETE FROM catalog WHERE <dtml-sqltest uid op=eq type=int>
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-DELETE FROM catalog WHERE <dtml-sqltest uid op=eq type=int>
+DELETE FROM delivery WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
@@ -19647,7 +20934,7 @@ DELETE FROM catalog WHERE <dtml-sqltest uid op=eq type=int>
</dictionary>
</pickle>
</record>
- <record id="126" aka="AAAAAAAAAH4=">
+ <record id="127" aka="AAAAAAAAAH8=">
<pickle>
<tuple>
<tuple>
@@ -19689,7 +20976,7 @@ DELETE FROM catalog WHERE <dtml-sqltest uid op=eq type=int>
<value>
<dictionary>
<item>
- <key> <string>column</string> </key>
+ <key> <string>uid</string> </key>
<value>
<dictionary/>
</value>
@@ -19701,7 +20988,7 @@ DELETE FROM catalog WHERE <dtml-sqltest uid op=eq type=int>
<key> <string>_keys</string> </key>
<value>
<list>
-<string>column</string>
+<string>uid</string>
</list>
</value>
</item>
@@ -19718,7 +21005,7 @@ DELETE FROM catalog WHERE <dtml-sqltest uid op=eq type=int>
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>column</string> </value>
+ <value> <string>uid</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -19744,7 +21031,7 @@ DELETE FROM catalog WHERE <dtml-sqltest uid op=eq type=int>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>z_unique_values</string> </value>
+ <value> <string>z_uncatalog_object</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
@@ -19758,7 +21045,7 @@ DELETE FROM catalog WHERE <dtml-sqltest uid op=eq type=int>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-SELECT DISTINCT <dtml-var column> FROM catalog
+DELETE FROM catalog WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
@@ -19796,7 +21083,7 @@ SELECT DISTINCT <dtml-var column> FROM catalog
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-SELECT DISTINCT <dtml-var column> FROM catalog
+DELETE FROM catalog WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
@@ -19812,7 +21099,7 @@ SELECT DISTINCT <dtml-var column> FROM catalog
</dictionary>
</pickle>
</record>
- <record id="127" aka="AAAAAAAAAH8=">
+ <record id="128" aka="AAAAAAAAAIA=">
<pickle>
<tuple>
<tuple>
@@ -19983,16 +21270,15 @@ INSERT INTO delivery(uid) VALUES (<dtml-sqlvar uid type="int">);\n
</dtml-if>\n
<dtml-if isDelivery>\n
UPDATE delivery SET\n
- uid = <dtml-sqlvar uid type="int">,\n
- source_uid = <dtml-if getSourceUid><dtml-sqlvar getSourceUid type="int"><dtml-else>NULL</dtml-if>,\n
- destination_uid = <dtml-if getDestinationUid ><dtml-sqlvar getDestinationUid type="int"><dtml-else>NULL</dtml-if>,\n
- source_section_uid = <dtml-if getSourceSectionUid><dtml-sqlvar getSourceSectionUid type="int"><dtml-else>NULL</dtml-if>,\n
- destination_section_uid = <dtml-if getDestinationSectionUid ><dtml-sqlvar getDestinationSectionUid type="int"><dtml-else>NULL</dtml-if>,\n
- resource_uid = <dtml-if getResourceUid><dtml-sqlvar getResourceUid type="int"><dtml-else>NULL</dtml-if>,\n
- start_date = <dtml-if getStartDate><dtml-sqlvar getStartDate type="string"><dtml-else>NULL</dtml-if>,\n
- stop_date = <dtml-if getStopDate><dtml-sqlvar getStopDate type="string"><dtml-else>NULL</dtml-if>\n
-WHERE\n
- <dtml-sqltest uid op=eq type=int>\n
+ uid=<dtml-sqlvar uid type="int">,\n
+ source_uid=<dtml-sqlvar getSourceUid type="int" optional>,\n
+ destination_uid=<dtml-sqlvar getDestinationUid type="int" optional>,\n
+ source_section_uid=<dtml-sqlvar getSourceSectionUid type="int" optional>,\n
+ destination_section_uid=<dtml-sqlvar getDestinationSectionUid type="int" optional>,\n
+ resource_uid=<dtml-sqlvar getResourceUid type="int" optional>,\n
+ start_date=<dtml-sqlvar getStartDate type="string" optional>,\n
+ stop_date=<dtml-sqlvar getStopDate type="string" optional>\n
+WHERE <dtml-sqltest uid op=eq type=int>\n
</dtml-if>
]]></string> </value>
@@ -20039,16 +21325,15 @@ INSERT INTO delivery(uid) VALUES (<dtml-sqlvar uid type="int">);\n
</dtml-if>\n
<dtml-if isDelivery>\n
UPDATE delivery SET\n
- uid = <dtml-sqlvar uid type="int">,\n
- source_uid = <dtml-if getSourceUid><dtml-sqlvar getSourceUid type="int"><dtml-else>NULL</dtml-if>,\n
- destination_uid = <dtml-if getDestinationUid ><dtml-sqlvar getDestinationUid type="int"><dtml-else>NULL</dtml-if>,\n
- source_section_uid = <dtml-if getSourceSectionUid><dtml-sqlvar getSourceSectionUid type="int"><dtml-else>NULL</dtml-if>,\n
- destination_section_uid = <dtml-if getDestinationSectionUid ><dtml-sqlvar getDestinationSectionUid type="int"><dtml-else>NULL</dtml-if>,\n
- resource_uid = <dtml-if getResourceUid><dtml-sqlvar getResourceUid type="int"><dtml-else>NULL</dtml-if>,\n
- start_date = <dtml-if getStartDate><dtml-sqlvar getStartDate type="string"><dtml-else>NULL</dtml-if>,\n
- stop_date = <dtml-if getStopDate><dtml-sqlvar getStopDate type="string"><dtml-else>NULL</dtml-if>\n
-WHERE\n
- <dtml-sqltest uid op=eq type=int>\n
+ uid=<dtml-sqlvar uid type="int">,\n
+ source_uid=<dtml-sqlvar getSourceUid type="int" optional>,\n
+ destination_uid=<dtml-sqlvar getDestinationUid type="int" optional>,\n
+ source_section_uid=<dtml-sqlvar getSourceSectionUid type="int" optional>,\n
+ destination_section_uid=<dtml-sqlvar getDestinationSectionUid type="int" optional>,\n
+ resource_uid=<dtml-sqlvar getResourceUid type="int" optional>,\n
+ start_date=<dtml-sqlvar getStartDate type="string" optional>,\n
+ stop_date=<dtml-sqlvar getStopDate type="string" optional>\n
+WHERE <dtml-sqltest uid op=eq type=int>\n
</dtml-if>
]]></string> </value>
@@ -20065,7 +21350,7 @@ WHERE\n
</dictionary>
</pickle>
</record>
- <record id="128" aka="AAAAAAAAAIA=">
+ <record id="129" aka="AAAAAAAAAIE=">
<pickle>
<tuple>
<tuple>