diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogFullTextKeyTemplateItem/full_text_key_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogFullTextKeyTemplateItem/full_text_key_list.xml deleted file mode 100644 index 662e00e9f7f8c5262e04ab7244827a89098d392c..0000000000000000000000000000000000000000 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogFullTextKeyTemplateItem/full_text_key_list.xml +++ /dev/null @@ -1,4 +0,0 @@ -<key_list> - <key>SearchableText</key> - <key>full_text.SearchableText</key> -</key_list> \ No newline at end of file diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_fulltext.catalog_keys.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_fulltext.catalog_keys.xml deleted file mode 100644 index b0fe64af0023d1e8f1c26007d25a81cf482bbf5d..0000000000000000000000000000000000000000 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_fulltext.catalog_keys.xml +++ /dev/null @@ -1,5 +0,0 @@ -<catalog_method> - <item key="sql_clear_catalog" type="int"> - <value>1</value> - </item> -</catalog_method> diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_fulltext.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_fulltext.xml deleted file mode 100644 index c9a106278b67975e5bbabedef7e9d418d063af10..0000000000000000000000000000000000000000 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_fulltext.xml +++ /dev/null @@ -1,64 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="SQL" module="Products.ZSQLMethods.SQL"/> - </pickle> - <pickle> - <dictionary> - <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 IF EXISTS full_text</string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_fulltext.catalog_keys.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_fulltext.catalog_keys.xml deleted file mode 100644 index d29d36d9f07b76c1a31ae6bec739102b93101efd..0000000000000000000000000000000000000000 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_fulltext.catalog_keys.xml +++ /dev/null @@ -1,5 +0,0 @@ -<catalog_method> - <item key="sql_uncatalog_object" type="int"> - <value>1</value> - </item> -</catalog_method> diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_fulltext.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_fulltext.xml deleted file mode 100644 index d707d07629ce0b4fa909276ced8863cc413c698e..0000000000000000000000000000000000000000 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_fulltext.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="SQL" module="Products.ZSQLMethods.SQL"/> - </pickle> - <pickle> - <dictionary> - <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>title</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_fulltext_list.catalog_keys.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_fulltext_list.catalog_keys.xml deleted file mode 100644 index c95a68655e4b28b9b03081ca25caf201b2237d18..0000000000000000000000000000000000000000 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_fulltext_list.catalog_keys.xml +++ /dev/null @@ -1,5 +0,0 @@ -<catalog_method> - <item key="sql_catalog_object_list" type="int"> - <value>1</value> - </item> -</catalog_method> diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_fulltext_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_fulltext_list.xml deleted file mode 100644 index 9615d9d7e9b11dc691124067cf85d87d0fdf837a..0000000000000000000000000000000000000000 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_fulltext_list.xml +++ /dev/null @@ -1,82 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="SQL" module="Products.ZSQLMethods.SQL"/> - </pickle> - <pickle> - <dictionary> - <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>title</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_fulltext.catalog_keys.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_fulltext.catalog_keys.xml deleted file mode 100644 index b0fe64af0023d1e8f1c26007d25a81cf482bbf5d..0000000000000000000000000000000000000000 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_fulltext.catalog_keys.xml +++ /dev/null @@ -1,5 +0,0 @@ -<catalog_method> - <item key="sql_clear_catalog" type="int"> - <value>1</value> - </item> -</catalog_method> diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_fulltext.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_fulltext.xml deleted file mode 100644 index 93b0926b105e541ba3ed5af00946e6980b9691af..0000000000000000000000000000000000000000 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_fulltext.xml +++ /dev/null @@ -1,80 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="SQL" module="Products.ZSQLMethods.SQL"/> - </pickle> - <pickle> - <dictionary> - <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></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 -) ENGINE=MyISAM;\n -</string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogResultTableTemplateItem/result_table_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogResultTableTemplateItem/result_table_list.xml index 1cd3d2acd50ab96a8c1ca6a325ca5dcd473a8056..0ab8e105734c96bed3ee57dc0e3000f08e782ef4 100644 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogResultTableTemplateItem/result_table_list.xml +++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogResultTableTemplateItem/result_table_list.xml @@ -3,7 +3,6 @@ <key>catalog</key> <key>category</key> <key>delivery</key> - <key>full_text</key> <key>inventory</key> <key>inventory_stock</key> <key>item</key> diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/change_log b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/change_log index fc8e3d8f1be4f43002d9c5064ea68dab8d6e55c5..a4d34b748811733519e100b2085a47d1dee00d3f 100644 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/change_log +++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/change_log @@ -1,3 +1,6 @@ +2011-01-31 Ivan +* Remove default MyISAM full text search which is to be provided by a separate business template + 2011-01-28 Ivan * Add site configurable 'full_text' scriptable key diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision index 0acdeb509ddefc9e5fcc09877e239a0863e211a9..c5a644422fb8f683632c43a9973c6f9bf3d5a12e 100644 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision +++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision @@ -1 +1 @@ -216 \ No newline at end of file +221 \ No newline at end of file diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_full_text_key_list b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_full_text_key_list deleted file mode 100644 index 5e90fc7ee3f16eded255dfd0e15d27469f0dad31..0000000000000000000000000000000000000000 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_full_text_key_list +++ /dev/null @@ -1,2 +0,0 @@ -SearchableText -full_text.SearchableText \ No newline at end of file diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_method_id_list b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_method_id_list index e9a42fb3187945966a919c62ec2868f50c2b1ecb..decb948e37f81329054b03fc6321684e40675727 100644 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_method_id_list +++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_method_id_list @@ -6,7 +6,6 @@ erp5_mysql_innodb/z0_drop_alarm erp5_mysql_innodb/z0_drop_catalog erp5_mysql_innodb/z0_drop_category erp5_mysql_innodb/z0_drop_delivery -erp5_mysql_innodb/z0_drop_fulltext erp5_mysql_innodb/z0_drop_inventory erp5_mysql_innodb/z0_drop_inventory_stock erp5_mysql_innodb/z0_drop_item @@ -24,7 +23,6 @@ erp5_mysql_innodb/z0_drop_translation erp5_mysql_innodb/z0_drop_versioning erp5_mysql_innodb/z0_uncatalog_alarm erp5_mysql_innodb/z0_uncatalog_category -erp5_mysql_innodb/z0_uncatalog_fulltext erp5_mysql_innodb/z0_uncatalog_inventory erp5_mysql_innodb/z0_uncatalog_inventory_stock erp5_mysql_innodb/z0_uncatalog_item @@ -38,7 +36,6 @@ erp5_mysql_innodb/z0_uncatalog_transformation erp5_mysql_innodb/z0_uncatalog_versioning erp5_mysql_innodb/z_catalog_alarm_list erp5_mysql_innodb/z_catalog_delivery_list -erp5_mysql_innodb/z_catalog_fulltext_list erp5_mysql_innodb/z_catalog_inventory_list erp5_mysql_innodb/z_catalog_inventory_stock_list erp5_mysql_innodb/z_catalog_item_list @@ -63,7 +60,6 @@ erp5_mysql_innodb/z_create_alarm erp5_mysql_innodb/z_create_catalog erp5_mysql_innodb/z_create_category erp5_mysql_innodb/z_create_delivery -erp5_mysql_innodb/z_create_fulltext erp5_mysql_innodb/z_create_inventory erp5_mysql_innodb/z_create_inventory_stock erp5_mysql_innodb/z_create_item diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_result_table_list b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_result_table_list index 49f32c7138c13d30b4bf07ca69bc56dfad39ae81..32d9f1a03f028a9d5123d3ca551d5e493cfb61bf 100644 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_result_table_list +++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_result_table_list @@ -2,7 +2,6 @@ catalog category alarm delivery -full_text inventory inventory_stock item