From d348ed7cfbb9fe6a6e5a3e44054ae15788f56a0a Mon Sep 17 00:00:00 2001 From: Yusei Tahara <yusei@nexedi.com> Date: Fri, 14 Mar 2008 17:06:22 +0000 Subject: [PATCH] 2008-03-14 yusei * Move email and subject table to erp5_ingestion. * Version up to 0.91. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19934 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../z0_drop_email.catalog_keys.xml | 5 - .../erp5_mysql_innodb/z0_drop_email.xml | 116 ---------- .../z0_drop_subject.catalog_keys.xml | 5 - .../erp5_mysql_innodb/z0_drop_subject.xml | 142 ------------ .../z0_uncatalog_email.catalog_keys.xml | 16 -- .../erp5_mysql_innodb/z0_uncatalog_email.xml | 133 ------------ .../z0_uncatalog_subject.catalog_keys.xml | 13 -- .../z0_uncatalog_subject.xml | 167 -------------- .../z_catalog_email_list.catalog_keys.xml | 16 -- .../z_catalog_email_list.xml | 185 ---------------- .../z_catalog_subject_list.catalog_keys.xml | 13 -- .../z_catalog_subject_list.xml | 203 ------------------ .../z_create_email.catalog_keys.xml | 5 - .../erp5_mysql_innodb/z_create_email.xml | 132 ------------ .../z_create_subject.catalog_keys.xml | 5 - .../erp5_mysql_innodb/z_create_subject.xml | 154 ------------- .../result_table_list.xml | 2 - .../bt/change_log | 4 + bt5/erp5_dms_mysql_innodb_catalog/bt/revision | 2 +- .../bt/template_catalog_local_role_key_list | 0 .../bt/template_catalog_method_id_list | 8 - .../bt/template_catalog_result_table_list | 4 +- .../bt/template_catalog_role_key_list | 0 .../bt/template_catalog_scriptable_key_list | 0 bt5/erp5_dms_mysql_innodb_catalog/bt/version | 2 +- 25 files changed, 7 insertions(+), 1325 deletions(-) delete mode 100644 bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_email.catalog_keys.xml delete mode 100644 bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_email.xml delete mode 100644 bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_subject.catalog_keys.xml delete mode 100644 bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_subject.xml delete mode 100644 bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.catalog_keys.xml delete mode 100644 bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.xml delete mode 100644 bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_subject.catalog_keys.xml delete mode 100644 bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_subject.xml delete mode 100644 bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.catalog_keys.xml delete mode 100644 bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.xml delete mode 100644 bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_subject_list.catalog_keys.xml delete mode 100644 bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_subject_list.xml delete mode 100644 bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.catalog_keys.xml delete mode 100644 bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.xml delete mode 100644 bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_subject.catalog_keys.xml delete mode 100644 bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_subject.xml create mode 100644 bt5/erp5_dms_mysql_innodb_catalog/bt/template_catalog_local_role_key_list create mode 100644 bt5/erp5_dms_mysql_innodb_catalog/bt/template_catalog_role_key_list create mode 100644 bt5/erp5_dms_mysql_innodb_catalog/bt/template_catalog_scriptable_key_list diff --git a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_email.catalog_keys.xml b/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_email.catalog_keys.xml deleted file mode 100644 index baf9e92bd9..0000000000 --- a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_email.catalog_keys.xml +++ /dev/null @@ -1,5 +0,0 @@ -<catalog_method> - <item key="sql_clear_catalog" type="int"> - <value>1</value> - </item> -</catalog_method> \ No newline at end of file diff --git a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_email.xml b/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_email.xml deleted file mode 100644 index e7887e8659..0000000000 --- a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_email.xml +++ /dev/null @@ -1,116 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <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> - <none/> - </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/> - </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_email</string> </value> - </item> - <item> - <key> <string>src</string> </key> - <value> <string>DROP TABLE IF EXISTS email;</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 IF EXISTS email;</string> </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_subject.catalog_keys.xml b/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_subject.catalog_keys.xml deleted file mode 100644 index baf9e92bd9..0000000000 --- a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_subject.catalog_keys.xml +++ /dev/null @@ -1,5 +0,0 @@ -<catalog_method> - <item key="sql_clear_catalog" type="int"> - <value>1</value> - </item> -</catalog_method> \ No newline at end of file diff --git a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_subject.xml b/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_subject.xml deleted file mode 100644 index 2d6178a827..0000000000 --- a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_subject.xml +++ /dev/null @@ -1,142 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <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> - <none/> - </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>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> - </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_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>DROP TABLE IF EXISTS subject</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 IF EXISTS subject</string> </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.catalog_keys.xml b/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.catalog_keys.xml deleted file mode 100644 index 1bd3cc6a20..0000000000 --- a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.catalog_keys.xml +++ /dev/null @@ -1,16 +0,0 @@ -<catalog_method> - <item key="sql_uncatalog_object" type="int"> - <value>1</value> - </item> - <item key="_is_filtered_archive" type="int"> - <value>1</value> - </item> - <item key="_filter_expression_archive" type="str"> - <value></value> - </item> - <item key="_filter_type_archive" type="tuple"> - <value>Email</value> - <value>Fax</value> - <value>Telephone</value> - </item> -</catalog_method> \ No newline at end of file diff --git a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.xml b/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.xml deleted file mode 100644 index b8f0ffaf87..0000000000 --- a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.xml +++ /dev/null @@ -1,133 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <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> - <none/> - </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> - <dictionary/> - </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>_keys</string> </key> - <value> - <list> - <string>uid</string> - </list> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </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>z0_uncatalog_email</string> </value> - </item> - <item> - <key> <string>src</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -DELETE FROM email WHERE <dtml-sqltest uid op=eq type=int> - -]]></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[ - -DELETE FROM email WHERE <dtml-sqltest uid op=eq type=int> - -]]></string> </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_subject.catalog_keys.xml b/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_subject.catalog_keys.xml deleted file mode 100644 index 627550d141..0000000000 --- a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_subject.catalog_keys.xml +++ /dev/null @@ -1,13 +0,0 @@ -<catalog_method> - <item key="sql_uncatalog_object" type="int"> - <value>1</value> - </item> - <item key="_is_filtered_archive" type="int"> - <value>1</value> - </item> - <item key="_filter_expression_archive" type="str"> - <value>python: isDocument</value> - </item> - <item key="_filter_type_archive" type="tuple"> - </item> -</catalog_method> \ No newline at end of file diff --git a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_subject.xml b/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_subject.xml deleted file mode 100644 index bbe1265e7b..0000000000 --- a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_subject.xml +++ /dev/null @@ -1,167 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <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> - <none/> - </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>isDocument</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> -<string>uid</string> -<string>isDocument</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 -isDocument</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> - </item> - <item> - <key> <string>src</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -DELETE FROM subject WHERE <dtml-sqltest uid op=eq type=int> - -]]></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[ - -DELETE FROM subject WHERE <dtml-sqltest uid op=eq type=int> - -]]></string> </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.catalog_keys.xml b/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.catalog_keys.xml deleted file mode 100644 index 809876bf47..0000000000 --- a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.catalog_keys.xml +++ /dev/null @@ -1,16 +0,0 @@ -<catalog_method> - <item key="sql_catalog_object_list" type="int"> - <value>1</value> - </item> - <item key="_is_filtered_archive" type="int"> - <value>1</value> - </item> - <item key="_filter_expression_archive" type="str"> - <value></value> - </item> - <item key="_filter_type_archive" type="tuple"> - <value>Email</value> - <value>Fax</value> - <value>Telephone</value> - </item> -</catalog_method> \ No newline at end of file diff --git a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.xml b/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.xml deleted file mode 100644 index b212af272a..0000000000 --- a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.xml +++ /dev/null @@ -1,185 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <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> - <none/> - </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>getPortalType</string> </key> - <value> - <dictionary/> - </value> - </item> - <item> - <key> <string>getUrlString</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> - <string>uid</string> - <string>getUrlString</string> - <string>getPortalType</string> - </list> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>arguments_src</string> </key> - <value> <string>uid\r\n -getUrlString\r\n -getPortalType</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_email_list</string> </value> - </item> - <item> - <key> <string>src</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -<dtml-let email_list="[]">\n - <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n - <dtml-if expr="getPortalType[loop_item]==\'Email\'">\n - <dtml-call expr="email_list.append(loop_item)">\n - </dtml-if>\n - </dtml-in>\n - <dtml-if expr="_.len(email_list) > 0">\n - REPLACE INTO\n - email\n - VALUES\n - <dtml-in prefix="loop" expr="email_list">\n - (\n - <dtml-sqlvar expr="uid[loop_item]" type="int">, \n - <dtml-sqlvar expr="getUrlString[loop_item]" type="string" optional>\n - )\n - <dtml-if sequence-end><dtml-else>,</dtml-if>\n - </dtml-in>\n - </dtml-if>\n -</dtml-let> - -]]></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 email_list="[]">\n - <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n - <dtml-if expr="getPortalType[loop_item]==\'Email\'">\n - <dtml-call expr="email_list.append(loop_item)">\n - </dtml-if>\n - </dtml-in>\n - <dtml-if expr="_.len(email_list) > 0">\n - REPLACE INTO\n - email\n - VALUES\n - <dtml-in prefix="loop" expr="email_list">\n - (\n - <dtml-sqlvar expr="uid[loop_item]" type="int">, \n - <dtml-sqlvar expr="getUrlString[loop_item]" type="string" optional>\n - )\n - <dtml-if sequence-end><dtml-else>,</dtml-if>\n - </dtml-in>\n - </dtml-if>\n -</dtml-let> - -]]></string> </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_subject_list.catalog_keys.xml b/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_subject_list.catalog_keys.xml deleted file mode 100644 index 9c95597ff2..0000000000 --- a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_subject_list.catalog_keys.xml +++ /dev/null @@ -1,13 +0,0 @@ -<catalog_method> - <item key="sql_catalog_object_list" type="int"> - <value>1</value> - </item> - <item key="_is_filtered_archive" type="int"> - <value>1</value> - </item> - <item key="_filter_expression_archive" type="str"> - <value>python: isDocument</value> - </item> - <item key="_filter_type_archive" type="tuple"> - </item> -</catalog_method> \ No newline at end of file diff --git a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_subject_list.xml b/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_subject_list.xml deleted file mode 100644 index 8668b71f42..0000000000 --- a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_subject_list.xml +++ /dev/null @@ -1,203 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <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> - <none/> - </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>getSubjectList</string> </key> - <value> - <dictionary/> - </value> - </item> - <item> - <key> <string>isDocument</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> -<string>getSubjectList</string> -<string>isDocument</string> -<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>getSubjectList\r\n -isDocument\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> - </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_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> - </item> - <item> - <key> <string>src</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -REPLACE 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="getSubjectList[loop_item]">\n - <dtml-if subject>\n - <dtml-in prefix="word" expr="subject">\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> - <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[ - -REPLACE 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="getSubjectList[loop_item]">\n - <dtml-if subject>\n - <dtml-in prefix="word" expr="subject">\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> - </object> - </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.catalog_keys.xml b/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.catalog_keys.xml deleted file mode 100644 index baf9e92bd9..0000000000 --- a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.catalog_keys.xml +++ /dev/null @@ -1,5 +0,0 @@ -<catalog_method> - <item key="sql_clear_catalog" type="int"> - <value>1</value> - </item> -</catalog_method> \ No newline at end of file diff --git a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.xml b/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.xml deleted file mode 100644 index e744a6d20f..0000000000 --- a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.xml +++ /dev/null @@ -1,132 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <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> - <none/> - </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> - <none/> - </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_email</string> </value> - </item> - <item> - <key> <string>src</string> </key> - <value> <string>CREATE TABLE `email` (\n - `uid` BIGINT UNSIGNED NOT NULL,\n - `url_string` varchar(255),\n - PRIMARY KEY `uid` (`uid`),\n - KEY `url_string` (`url_string`)\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> - -]]></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 `email` (\n - `uid` BIGINT UNSIGNED NOT NULL,\n - `url_string` varchar(255),\n - PRIMARY KEY `uid` (`uid`),\n - KEY `url_string` (`url_string`)\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> -</ZopeData> diff --git a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_subject.catalog_keys.xml b/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_subject.catalog_keys.xml deleted file mode 100644 index baf9e92bd9..0000000000 --- a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_subject.catalog_keys.xml +++ /dev/null @@ -1,5 +0,0 @@ -<catalog_method> - <item key="sql_clear_catalog" type="int"> - <value>1</value> - </item> -</catalog_method> \ No newline at end of file diff --git a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_subject.xml b/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_subject.xml deleted file mode 100644 index b238aa8560..0000000000 --- a/bt5/erp5_dms_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_subject.xml +++ /dev/null @@ -1,154 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <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> - <none/> - </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>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> - </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_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>CREATE TABLE subject (\n - uid BIGINT UNSIGNED NOT NULL,\n - subject VARCHAR(255),\n - PRIMARY KEY `uid` (`uid`),\n - KEY `allowedRolesAndUsers` (`Subject`)\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> - -]]></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 subject (\n - uid BIGINT UNSIGNED NOT NULL,\n - subject VARCHAR(255),\n - PRIMARY KEY `uid` (`uid`),\n - KEY `allowedRolesAndUsers` (`Subject`)\n -) TYPE=InnoDB; \n -</string> </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_dms_mysql_innodb_catalog/CatalogResultTableTemplateItem/result_table_list.xml b/bt5/erp5_dms_mysql_innodb_catalog/CatalogResultTableTemplateItem/result_table_list.xml index 6313bec1e1..ecc935c45a 100644 --- a/bt5/erp5_dms_mysql_innodb_catalog/CatalogResultTableTemplateItem/result_table_list.xml +++ b/bt5/erp5_dms_mysql_innodb_catalog/CatalogResultTableTemplateItem/result_table_list.xml @@ -1,5 +1,3 @@ <key_list> - <key>email</key> - <key>subject</key> <key>versioning</key> </key_list> \ No newline at end of file diff --git a/bt5/erp5_dms_mysql_innodb_catalog/bt/change_log b/bt5/erp5_dms_mysql_innodb_catalog/bt/change_log index 7ce414cf65..1d0361edd6 100644 --- a/bt5/erp5_dms_mysql_innodb_catalog/bt/change_log +++ b/bt5/erp5_dms_mysql_innodb_catalog/bt/change_log @@ -1,3 +1,7 @@ +2008-03-14 yusei +* Move email and subject table to erp5_ingestion. +* Version up to 0.91. + 2007-12-18 yusei *Fixed wrong field names in erp5_dms. diff --git a/bt5/erp5_dms_mysql_innodb_catalog/bt/revision b/bt5/erp5_dms_mysql_innodb_catalog/bt/revision index 9d0f8afde3..72b67e0ede 100644 --- a/bt5/erp5_dms_mysql_innodb_catalog/bt/revision +++ b/bt5/erp5_dms_mysql_innodb_catalog/bt/revision @@ -1 +1 @@ -578 \ No newline at end of file +579 \ No newline at end of file diff --git a/bt5/erp5_dms_mysql_innodb_catalog/bt/template_catalog_local_role_key_list b/bt5/erp5_dms_mysql_innodb_catalog/bt/template_catalog_local_role_key_list new file mode 100644 index 0000000000..e69de29bb2 diff --git a/bt5/erp5_dms_mysql_innodb_catalog/bt/template_catalog_method_id_list b/bt5/erp5_dms_mysql_innodb_catalog/bt/template_catalog_method_id_list index 58ea2429e4..377ad95c24 100644 --- a/bt5/erp5_dms_mysql_innodb_catalog/bt/template_catalog_method_id_list +++ b/bt5/erp5_dms_mysql_innodb_catalog/bt/template_catalog_method_id_list @@ -1,14 +1,6 @@ erp5_mysql_innodb/SQLCatalog_makeAdvancedSearchQuery erp5_mysql_innodb/SQLCatalog_makeQuickSearchQuery -erp5_mysql_innodb/z0_drop_email -erp5_mysql_innodb/z0_drop_subject erp5_mysql_innodb/z0_drop_versioning -erp5_mysql_innodb/z0_uncatalog_email -erp5_mysql_innodb/z0_uncatalog_subject erp5_mysql_innodb/z0_uncatalog_versioning -erp5_mysql_innodb/z_catalog_email_list -erp5_mysql_innodb/z_catalog_subject_list erp5_mysql_innodb/z_catalog_versioning_list -erp5_mysql_innodb/z_create_email -erp5_mysql_innodb/z_create_subject erp5_mysql_innodb/z_create_versioning \ No newline at end of file diff --git a/bt5/erp5_dms_mysql_innodb_catalog/bt/template_catalog_result_table_list b/bt5/erp5_dms_mysql_innodb_catalog/bt/template_catalog_result_table_list index bb081e538b..ac87b6ead6 100644 --- a/bt5/erp5_dms_mysql_innodb_catalog/bt/template_catalog_result_table_list +++ b/bt5/erp5_dms_mysql_innodb_catalog/bt/template_catalog_result_table_list @@ -1,3 +1 @@ -versioning -email -subject \ No newline at end of file +versioning \ No newline at end of file diff --git a/bt5/erp5_dms_mysql_innodb_catalog/bt/template_catalog_role_key_list b/bt5/erp5_dms_mysql_innodb_catalog/bt/template_catalog_role_key_list new file mode 100644 index 0000000000..e69de29bb2 diff --git a/bt5/erp5_dms_mysql_innodb_catalog/bt/template_catalog_scriptable_key_list b/bt5/erp5_dms_mysql_innodb_catalog/bt/template_catalog_scriptable_key_list new file mode 100644 index 0000000000..e69de29bb2 diff --git a/bt5/erp5_dms_mysql_innodb_catalog/bt/version b/bt5/erp5_dms_mysql_innodb_catalog/bt/version index 9a7d84f2a9..9fa447e457 100644 --- a/bt5/erp5_dms_mysql_innodb_catalog/bt/version +++ b/bt5/erp5_dms_mysql_innodb_catalog/bt/version @@ -1 +1 @@ -0.9 \ No newline at end of file +0.91 \ No newline at end of file -- 2.30.9