From 677486559060953c28bb782ba048fae9160f937f Mon Sep 17 00:00:00 2001 From: Kevin Deldycke <kevin@nexedi.com> Date: Thu, 15 Jun 2006 08:59:53 +0000 Subject: [PATCH] Move fulltext indexing ZSQLMethods from erp5_web to erp5_core. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7724 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../z0_drop_fulltext.catalog_keys.xml | 2 + .../erp5_mysql/z0_drop_fulltext.xml | 148 +++++++++++++ .../z0_uncatalog_fulltext.catalog_keys.xml | 2 + .../erp5_mysql/z0_uncatalog_fulltext.xml | 165 +++++++++++++++ .../z_catalog_fulltext_list.catalog_keys.xml | 2 + .../erp5_mysql/z_catalog_fulltext_list.xml | 199 ++++++++++++++++++ .../z_create_fulltext.catalog_keys.xml | 2 + .../erp5_mysql/z_create_fulltext.xml | 174 +++++++++++++++ .../ERP5/bootstrap/erp5_core/bt/change_log | 4 + .../bt/template_catalog_method_id_list | 4 + 10 files changed, 702 insertions(+) create mode 100644 product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.catalog_keys.xml create mode 100644 product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.xml create mode 100644 product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.catalog_keys.xml create mode 100644 product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.xml create mode 100644 product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.catalog_keys.xml create mode 100644 product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.xml create mode 100644 product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.catalog_keys.xml create mode 100644 product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.xml diff --git a/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.catalog_keys.xml b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.catalog_keys.xml new file mode 100644 index 0000000000..7d6996cb9c --- /dev/null +++ b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.catalog_keys.xml @@ -0,0 +1,2 @@ +<catalog_method> +</catalog_method> \ No newline at end of file diff --git a/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.xml b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.xml new file mode 100644 index 0000000000..9deba222a6 --- /dev/null +++ b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.xml @@ -0,0 +1,148 @@ +<?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>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_deferred_connection</string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>z0_drop_fulltext</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 full_text</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 full_text</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/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.catalog_keys.xml b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.catalog_keys.xml new file mode 100644 index 0000000000..7d6996cb9c --- /dev/null +++ b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.catalog_keys.xml @@ -0,0 +1,2 @@ +<catalog_method> +</catalog_method> \ No newline at end of file diff --git a/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.xml b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.xml new file mode 100644 index 0000000000..b1af42d6bb --- /dev/null +++ b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.xml @@ -0,0 +1,165 @@ +<?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>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_deferred_connection</string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>z0_uncatalog_fulltext</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 full_text 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 full_text 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/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.catalog_keys.xml b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.catalog_keys.xml new file mode 100644 index 0000000000..7d6996cb9c --- /dev/null +++ b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.catalog_keys.xml @@ -0,0 +1,2 @@ +<catalog_method> +</catalog_method> \ No newline at end of file diff --git a/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.xml b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.xml new file mode 100644 index 0000000000..aae4a3c434 --- /dev/null +++ b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.xml @@ -0,0 +1,199 @@ +<?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>SearchableText</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>SearchableText</string> + </list> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </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 +SearchableText</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_deferred_connection</string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>z_catalog_fulltext_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\n + full_text\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="SearchableText[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> + <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\n + full_text\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="SearchableText[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> + </object> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.catalog_keys.xml b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.catalog_keys.xml new file mode 100644 index 0000000000..7d6996cb9c --- /dev/null +++ b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.catalog_keys.xml @@ -0,0 +1,2 @@ +<catalog_method> +</catalog_method> \ No newline at end of file diff --git a/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.xml b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.xml new file mode 100644 index 0000000000..005b4aff58 --- /dev/null +++ b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.xml @@ -0,0 +1,174 @@ +<?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>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_deferred_connection</string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>z_create_fulltext</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># Host:\n +# Database: test\n +# Table: \'full_text\'\n +#\n +CREATE TABLE `full_text` (\n + `uid` BIGINT UNSIGNED NOT NULL,\n + `SearchableText` text,\n + PRIMARY KEY (`uid`),\n + FULLTEXT `SearchableText` (`SearchableText`)\n +);\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># Host:\n +# Database: test\n +# Table: \'full_text\'\n +#\n +CREATE TABLE `full_text` (\n + `uid` BIGINT UNSIGNED NOT NULL,\n + `SearchableText` text,\n + PRIMARY KEY (`uid`),\n + FULLTEXT `SearchableText` (`SearchableText`)\n +);\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/product/ERP5/bootstrap/erp5_core/bt/change_log b/product/ERP5/bootstrap/erp5_core/bt/change_log index 23566c8587..89efab3efe 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/change_log +++ b/product/ERP5/bootstrap/erp5_core/bt/change_log @@ -1,3 +1,7 @@ +2006-06-15 Kevin +* Move fulltext indexing ZSQLMethods from erp5_web to erp5_core. +* Commit Vincent's DocumentHelper Work. + 2006-06-08 Kevin * Update ERP5Site_checkNamingConventions Todo list. diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_catalog_method_id_list b/product/ERP5/bootstrap/erp5_core/bt/template_catalog_method_id_list index 97e9550ca6..5032068ab8 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/template_catalog_method_id_list +++ b/product/ERP5/bootstrap/erp5_core/bt/template_catalog_method_id_list @@ -2,6 +2,7 @@ erp5_mysql/z0_drop_catalog erp5_mysql/z0_drop_category erp5_mysql/z0_drop_compatibility erp5_mysql/z0_drop_delivery +erp5_mysql/z0_drop_fulltext erp5_mysql/z0_drop_item erp5_mysql/z0_drop_movement erp5_mysql/z0_drop_predicate @@ -13,6 +14,7 @@ erp5_mysql/z0_drop_subject erp5_mysql/z0_drop_translation erp5_mysql/z0_uncatalog_category erp5_mysql/z0_uncatalog_compatibility +erp5_mysql/z0_uncatalog_fulltext erp5_mysql/z0_uncatalog_item erp5_mysql/z0_uncatalog_movement erp5_mysql/z0_uncatalog_predicate @@ -21,6 +23,7 @@ erp5_mysql/z0_uncatalog_stock erp5_mysql/z0_uncatalog_subject erp5_mysql/z_catalog_compatibility_list erp5_mysql/z_catalog_delivery_list +erp5_mysql/z_catalog_fulltext_list erp5_mysql/z_catalog_item_list erp5_mysql/z_catalog_movement_category_list erp5_mysql/z_catalog_movement_list @@ -39,6 +42,7 @@ erp5_mysql/z_create_catalog erp5_mysql/z_create_category erp5_mysql/z_create_compatibility erp5_mysql/z_create_delivery +erp5_mysql/z_create_fulltext erp5_mysql/z_create_item erp5_mysql/z_create_movement erp5_mysql/z_create_predicate -- 2.30.9