From 0dbf2f503aaffcc521e16800e4adce0359ae02d6 Mon Sep 17 00:00:00 2001 From: Kevin Deldycke <kevin@nexedi.com> Date: Thu, 15 Jun 2006 08:58:00 +0000 Subject: [PATCH] Move fulltext indexing ZSQLMethods to erp5_core. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7723 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 --------------- bt5/erp5_web/bt/change_log | 3 + .../bt/template_catalog_method_id_list | 4 - 10 files changed, 3 insertions(+), 698 deletions(-) delete mode 100644 bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.catalog_keys.xml delete mode 100644 bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.xml delete mode 100644 bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.catalog_keys.xml delete mode 100644 bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.xml delete mode 100644 bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.catalog_keys.xml delete mode 100644 bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.xml delete mode 100644 bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.catalog_keys.xml delete mode 100644 bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.xml diff --git a/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.catalog_keys.xml b/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.catalog_keys.xml deleted file mode 100644 index 7d6996cb9c..0000000000 --- a/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.catalog_keys.xml +++ /dev/null @@ -1,2 +0,0 @@ -<catalog_method> -</catalog_method> \ No newline at end of file diff --git a/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.xml b/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.xml deleted file mode 100644 index 9deba222a6..0000000000 --- a/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.xml +++ /dev/null @@ -1,148 +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>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/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.catalog_keys.xml b/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.catalog_keys.xml deleted file mode 100644 index 7d6996cb9c..0000000000 --- a/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.catalog_keys.xml +++ /dev/null @@ -1,2 +0,0 @@ -<catalog_method> -</catalog_method> \ No newline at end of file diff --git a/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.xml b/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.xml deleted file mode 100644 index b1af42d6bb..0000000000 --- a/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.xml +++ /dev/null @@ -1,165 +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>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/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.catalog_keys.xml b/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.catalog_keys.xml deleted file mode 100644 index 7d6996cb9c..0000000000 --- a/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.catalog_keys.xml +++ /dev/null @@ -1,2 +0,0 @@ -<catalog_method> -</catalog_method> \ No newline at end of file diff --git a/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.xml b/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.xml deleted file mode 100644 index aae4a3c434..0000000000 --- a/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.xml +++ /dev/null @@ -1,199 +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>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/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.catalog_keys.xml b/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.catalog_keys.xml deleted file mode 100644 index 7d6996cb9c..0000000000 --- a/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.catalog_keys.xml +++ /dev/null @@ -1,2 +0,0 @@ -<catalog_method> -</catalog_method> \ No newline at end of file diff --git a/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.xml b/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.xml deleted file mode 100644 index 005b4aff58..0000000000 --- a/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.xml +++ /dev/null @@ -1,174 +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>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/bt5/erp5_web/bt/change_log b/bt5/erp5_web/bt/change_log index 50ac6a94fb..f077f71f86 100644 --- a/bt5/erp5_web/bt/change_log +++ b/bt5/erp5_web/bt/change_log @@ -1,3 +1,6 @@ +2006-06-15 Kevin +* Move fulltext indexing ZSQLMethods to erp5_core. + 2006-06-12 Kevin * Update maintainer list. diff --git a/bt5/erp5_web/bt/template_catalog_method_id_list b/bt5/erp5_web/bt/template_catalog_method_id_list index cf2121c321..e69de29bb2 100644 --- a/bt5/erp5_web/bt/template_catalog_method_id_list +++ b/bt5/erp5_web/bt/template_catalog_method_id_list @@ -1,4 +0,0 @@ -erp5_mysql/z0_drop_fulltext -erp5_mysql/z0_uncatalog_fulltext -erp5_mysql/z_catalog_fulltext_list -erp5_mysql/z_create_fulltext \ No newline at end of file -- 2.30.9