From cd151bd27621d6b5213d423f02a0b03fd8d0d02a Mon Sep 17 00:00:00 2001
From: Ivan Tyagov <ivan@nexedi.com>
Date: Fri, 28 Jan 2011 11:10:01 +0000
Subject: [PATCH] Revert part of r42730. Real full text search will be provided
by a separate business template (MySQL full text, Sphix or another one).
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@42734 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../SQLCatalog_makeFullTextQuery.xml | 12 ++-
.../erp5_mysql_innodb_catalog.xml | 26 ------
.../SQLCatalog_isSphinxSearchAvailable.xml | 81 -------------------
.../erp5_mysql_innodb_catalog/bt/revision | 2 +-
.../bt/template_skin_id_list | 1 -
5 files changed, 6 insertions(+), 116 deletions(-)
delete mode 100644 product/ERP5/bootstrap/erp5_mysql_innodb_catalog/SkinTemplateItem/portal_skins/erp5_mysql_innodb_catalog.xml
delete mode 100644 product/ERP5/bootstrap/erp5_mysql_innodb_catalog/SkinTemplateItem/portal_skins/erp5_mysql_innodb_catalog/SQLCatalog_isSphinxSearchAvailable.xml
delete mode 100644 product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_skin_id_list
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_makeFullTextQuery.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_makeFullTextQuery.xml
index 3cf4e8a333..fffa99de92 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_makeFullTextQuery.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_makeFullTextQuery.xml
@@ -51,16 +51,14 @@
<item>
<key> <string>_body</string> </key>
<value> <string>"""\n
- Generic full text searchable key which based on site configuration will use\n
- available third party search engine (Sphinx) or fall back to default \n
- MySQL full text search.\n
+ Default full text searchable key implementation.\n
"""\n
+from Products.ZSQLCatalog.SQLCatalog import ComplexQuery\n
from Products.ZSQLCatalog.SQLCatalog import Query\n
\n
-if context.SQLCatalog_isSphinxSearchAvailable():\n
- query = Query(**{\'sphinxse_query\':value})\n
-else:\n
- query = Query(**{\'full_text.SearchableText\':value})\n
+query = ComplexQuery(Query(title=value),\n
+ Query(reference=value),\n
+ operator="OR")\n
return query\n
</string> </value>
</item>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/SkinTemplateItem/portal_skins/erp5_mysql_innodb_catalog.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/SkinTemplateItem/portal_skins/erp5_mysql_innodb_catalog.xml
deleted file mode 100644
index 69317d4e82..0000000000
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/SkinTemplateItem/portal_skins/erp5_mysql_innodb_catalog.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <global name="OrderedFolder" module="OFS.OrderedFolder"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_objects</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>erp5_mysql_innodb_catalog</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/SkinTemplateItem/portal_skins/erp5_mysql_innodb_catalog/SQLCatalog_isSphinxSearchAvailable.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/SkinTemplateItem/portal_skins/erp5_mysql_innodb_catalog/SQLCatalog_isSphinxSearchAvailable.xml
deleted file mode 100644
index 8796aeec46..0000000000
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/SkinTemplateItem/portal_skins/erp5_mysql_innodb_catalog/SQLCatalog_isSphinxSearchAvailable.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>Script_magic</string> </key>
- <value> <int>3</int> </value>
- </item>
- <item>
- <key> <string>_bind_names</string> </key>
- <value>
- <object>
- <klass>
- <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_asgns</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>name_container</string> </key>
- <value> <string>container</string> </value>
- </item>
- <item>
- <key> <string>name_context</string> </key>
- <value> <string>context</string> </value>
- </item>
- <item>
- <key> <string>name_m_self</string> </key>
- <value> <string>script</string> </value>
- </item>
- <item>
- <key> <string>name_subpath</string> </key>
- <value> <string>traverse_subpath</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>_body</string> </key>
- <value> <string>"""\n
- Used to check if Sphinx search is available.\n
- Proxy mode added so this check can happen for anonymous users.\n
-"""\n
-# XXX Should we use system preference here?\n
-portal_catalog = context.getPortalObject().portal_catalog\n
-return \'sphinxse_index\' in getattr(portal_catalog, portal_catalog.default_sql_catalog_id).getCatalogSearchTableIds()\n
-</string> </value>
- </item>
- <item>
- <key> <string>_params</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>_proxy_roles</string> </key>
- <value>
- <tuple>
- <string>Manager</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>SQLCatalog_isSphinxSearchAvailable</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
index 02cfe0b571..0acdeb509d 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
@@ -1 +1 @@
-213
\ No newline at end of file
+216
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_skin_id_list b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_skin_id_list
deleted file mode 100644
index 1e510f863e..0000000000
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_skin_id_list
+++ /dev/null
@@ -1 +0,0 @@
-erp5_mysql_innodb_catalog
\ No newline at end of file
--
2.30.9