[Erp5-report] r41954 kazuhiko - in /erp5/trunk/bt5/erp5_full_text_sphinxse_catalog: Catalog...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Jan  3 16:10:59 2011
New Revision: 41954

URL: http://svn.erp5.org?rev=41954&view=rev
Log:
2011-01-03 Kazuhiko
* retrieve SearchableText from catalog, not calling SearchableText method.
* Use InnoDB with non-deferred connection for full_text table, because we don't need fulltext search function of transactionless MyISAM engine.

Modified:
    erp5/trunk/bt5/erp5_full_text_sphinxse_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_catalogSphinxSE.xml
    erp5/trunk/bt5/erp5_full_text_sphinxse_catalog/bt/change_log
    erp5/trunk/bt5/erp5_full_text_sphinxse_catalog/bt/revision

Modified: erp5/trunk/bt5/erp5_full_text_sphinxse_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_catalogSphinxSE.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_full_text_sphinxse_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_catalogSphinxSE.xml?rev=41954&r1=41953&r2=41954&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_full_text_sphinxse_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_catalogSphinxSE.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_full_text_sphinxse_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_catalogSphinxSE.xml [utf8] Mon Jan  3 16:10:59 2011
@@ -53,6 +53,19 @@
             <value> <string>from Products.ERP5Type.Utils import UpperCase\n
 from ZODB.POSException import ConflictError\n
 \n
+# Retrieves SearchableText from catalog\n
+method = context.z_catalog_sphinxse_index_list\n
+parameter_dict = {\'uid\':[], \'SearchableText\':[]}\n
+for i in context.getPortalObject().portal_catalog(path=getPath, select_expression=\'SearchableText\'):\n
+  for property in (\'uid\', \'SearchableText\'):\n
+    parameter_dict[property].append(getattr(i, property))\n
+if len(parameter_dict):\n
+  return method(**parameter_dict)\n
+return\n
+\n
+# the following is the alternate version that fails in case of errors (eg. NotConvertedError).\n
+# if we separate updating full_text table activities too, we can consider using this one.\n
+\n
 # Obtain the properties from the Z SQL Method itself, as like catalogObjectList.\n
 method = context.z_catalog_sphinxse_index_list\n
 property_list = method.arguments_src.split()\n

Modified: erp5/trunk/bt5/erp5_full_text_sphinxse_catalog/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_full_text_sphinxse_catalog/bt/change_log?rev=41954&r1=41953&r2=41954&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_full_text_sphinxse_catalog/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_full_text_sphinxse_catalog/bt/change_log [utf8] Mon Jan  3 16:10:59 2011
@@ -1,4 +1,5 @@
 2011-01-03 Kazuhiko
+* retrieve SearchableText from catalog, not calling SearchableText method.
 * Use InnoDB with non-deferred connection for full_text table, because we don't need fulltext search function of transactionless MyISAM engine.
 
 2011-01-02 Kazuhiko

Modified: erp5/trunk/bt5/erp5_full_text_sphinxse_catalog/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_full_text_sphinxse_catalog/bt/revision?rev=41954&r1=41953&r2=41954&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_full_text_sphinxse_catalog/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_full_text_sphinxse_catalog/bt/revision [utf8] Mon Jan  3 16:10:59 2011
@@ -1 +1 @@
-12
\ No newline at end of file
+13
\ No newline at end of file