From 84651880bbc7a6a4fc8ed9400096278ed7c31c53 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Fri, 21 Nov 2014 21:44:54 +0100 Subject: [PATCH] fixup! rewrite SQLCatalog_makeSearchTextQuery without using ad-hoc Base_parseSearchString. --- .../extension.erp5.SearchUtility.py | 0 .../extension.erp5.SearchUtility.xml | 0 .../Base_getAdvancedSearchSyntaxTreeNode.xml | 28 +++++++++++++++++++ .../bt/template_extension_id_list | 1 - 4 files changed, 28 insertions(+), 1 deletion(-) rename product/ERP5/bootstrap/{erp5_mysql_innodb_catalog => erp5_core}/ExtensionTemplateItem/portal_components/extension.erp5.SearchUtility.py (100%) rename product/ERP5/bootstrap/{erp5_mysql_innodb_catalog => erp5_core}/ExtensionTemplateItem/portal_components/extension.erp5.SearchUtility.xml (100%) create mode 100644 product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getAdvancedSearchSyntaxTreeNode.xml delete mode 100644 product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_extension_id_list diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/ExtensionTemplateItem/portal_components/extension.erp5.SearchUtility.py b/product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.SearchUtility.py similarity index 100% rename from product/ERP5/bootstrap/erp5_mysql_innodb_catalog/ExtensionTemplateItem/portal_components/extension.erp5.SearchUtility.py rename to product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.SearchUtility.py diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/ExtensionTemplateItem/portal_components/extension.erp5.SearchUtility.xml b/product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.SearchUtility.xml similarity index 100% rename from product/ERP5/bootstrap/erp5_mysql_innodb_catalog/ExtensionTemplateItem/portal_components/extension.erp5.SearchUtility.xml rename to product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.SearchUtility.xml diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getAdvancedSearchSyntaxTreeNode.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getAdvancedSearchSyntaxTreeNode.xml new file mode 100644 index 0000000000..366521bd4a --- /dev/null +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getAdvancedSearchSyntaxTreeNode.xml @@ -0,0 +1,28 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_function</string> </key> + <value> <string>getAdvancedSearchSyntaxTreeNode</string> </value> + </item> + <item> + <key> <string>_module</string> </key> + <value> <string>SearchUtility</string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>Base_getAdvancedSearchSyntaxTreeNode</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/bt/template_extension_id_list b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_extension_id_list deleted file mode 100644 index fa6ef61e1d..0000000000 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_extension_id_list +++ /dev/null @@ -1 +0,0 @@ -extension.erp5.SearchUtility \ No newline at end of file -- 2.30.9