[Erp5-report] r42734 ivan - in /erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalo...

[nobody at svn.erp5.org]

Author: ivan
Date: Fri Jan 28 12:10:01 2011
New Revision: 42734

URL: http://svn.erp5.org?rev=42734&view=rev
Log:
Revert part of r42730. Real full text search will be provided by a separate business template (MySQL full text, Sphix or another one).

Removed:
    erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/SkinTemplateItem/
    erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_skin_id_list
Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_makeFullTextQuery.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_makeFullTextQuery.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_makeFullTextQuery.xml?rev=42734&r1=42733&r2=42734&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_makeFullTextQuery.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_makeFullTextQuery.xml [utf8] Fri Jan 28 12:10:01 2011
@@ -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>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision?rev=42734&r1=42733&r2=42734&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision [utf8] Fri Jan 28 12:10:01 2011
@@ -1 +1 @@
-213
\ No newline at end of file
+216
\ No newline at end of file

Removed: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_skin_id_list
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_skin_id_list?rev=42733&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_skin_id_list [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_skin_id_list (removed)
@@ -1 +0,0 @@
-erp5_mysql_innodb_catalog
\ No newline at end of file