[Erp5-report] r32434 nicolas - in /erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog: Cata...

nobody at svn.erp5.org nobody at svn.erp5.org
Thu Feb 11 16:58:15 CET 2010


Author: nicolas
Date: Thu Feb 11 16:58:14 2010
New Revision: 32434

URL: http://svn.erp5.org?rev=32434&view=rev
Log:
Use last catalog optimisation
* Change Tales Expression of Catalog Method Filter (context, cache_key)
Reviewed by JM

Added:
    erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/bt/template_local_role_list
    erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/bt/template_portal_type_role_list
    erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/bt/template_registered_skin_selection_list
Modified:
    erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_email.catalog_keys.xml
    erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_subject.catalog_keys.xml
    erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.catalog_keys.xml
    erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_subject.catalog_keys.xml
    erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.catalog_keys.xml
    erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_subject_list.catalog_keys.xml
    erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.catalog_keys.xml
    erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_subject.catalog_keys.xml
    erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/bt/revision

Modified: erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_email.catalog_keys.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_email.catalog_keys.xml?rev=32434&r1=32433&r2=32434&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_email.catalog_keys.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_email.catalog_keys.xml [utf8] Thu Feb 11 16:58:14 2010
@@ -2,4 +2,4 @@
  <item key="sql_clear_catalog" type="int">
   <value>1</value>
  </item>
-</catalog_method>
+</catalog_method>

Modified: erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_subject.catalog_keys.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_subject.catalog_keys.xml?rev=32434&r1=32433&r2=32434&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_subject.catalog_keys.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_subject.catalog_keys.xml [utf8] Thu Feb 11 16:58:14 2010
@@ -2,4 +2,4 @@
  <item key="sql_clear_catalog" type="int">
   <value>1</value>
  </item>
-</catalog_method>
+</catalog_method>

Modified: erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.catalog_keys.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.catalog_keys.xml?rev=32434&r1=32433&r2=32434&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.catalog_keys.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.catalog_keys.xml [utf8] Thu Feb 11 16:58:14 2010
@@ -6,11 +6,9 @@
   <value>1</value>
  </item>
  <item key="_filter_expression_archive" type="str">
-  <value></value>
+  <value>python: context.getPortalType() in ('Email', 'Fax', 'Telephone',)</value>
  </item>
- <item key="_filter_type_archive" type="tuple">
-  <value>Email</value>
-  <value>Fax</value>
-  <value>Telephone</value>
+ <item key="_filter_expression_cache_key_archive" type="tuple">
+  <value>portal_type</value>
  </item>
-</catalog_method>
+</catalog_method>

Modified: erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_subject.catalog_keys.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_subject.catalog_keys.xml?rev=32434&r1=32433&r2=32434&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_subject.catalog_keys.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_subject.catalog_keys.xml [utf8] Thu Feb 11 16:58:14 2010
@@ -6,8 +6,9 @@
   <value>1</value>
  </item>
  <item key="_filter_expression_archive" type="str">
-  <value>python: isDocument</value>
+  <value>python: context.isDocument()</value>
  </item>
- <item key="_filter_type_archive" type="tuple">
+ <item key="_filter_expression_cache_key_archive" type="tuple">
+  <value>portal_type</value>
  </item>
-</catalog_method>
+</catalog_method>

Modified: erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.catalog_keys.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.catalog_keys.xml?rev=32434&r1=32433&r2=32434&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.catalog_keys.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.catalog_keys.xml [utf8] Thu Feb 11 16:58:14 2010
@@ -6,11 +6,9 @@
   <value>1</value>
  </item>
  <item key="_filter_expression_archive" type="str">
-  <value></value>
+  <value>python: context.getPortalType() in ('Email', 'Fax', 'Telephone')</value>
  </item>
- <item key="_filter_type_archive" type="tuple">
-  <value>Email</value>
-  <value>Fax</value>
-  <value>Telephone</value>
+ <item key="_filter_expression_cache_key_archive" type="tuple">
+  <value>portal_type</value>
  </item>
-</catalog_method>
+</catalog_method>

Modified: erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_subject_list.catalog_keys.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_subject_list.catalog_keys.xml?rev=32434&r1=32433&r2=32434&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_subject_list.catalog_keys.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_subject_list.catalog_keys.xml [utf8] Thu Feb 11 16:58:14 2010
@@ -6,8 +6,9 @@
   <value>1</value>
  </item>
  <item key="_filter_expression_archive" type="str">
-  <value>python: isDocument</value>
+  <value>python: context.isDocument()</value>
  </item>
- <item key="_filter_type_archive" type="tuple">
+ <item key="_filter_expression_cache_key_archive" type="tuple">
+  <value>portal_type</value>
  </item>
-</catalog_method>
+</catalog_method>

Modified: erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.catalog_keys.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.catalog_keys.xml?rev=32434&r1=32433&r2=32434&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.catalog_keys.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.catalog_keys.xml [utf8] Thu Feb 11 16:58:14 2010
@@ -2,4 +2,4 @@
  <item key="sql_clear_catalog" type="int">
   <value>1</value>
  </item>
-</catalog_method>
+</catalog_method>

Modified: erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_subject.catalog_keys.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_subject.catalog_keys.xml?rev=32434&r1=32433&r2=32434&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_subject.catalog_keys.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_subject.catalog_keys.xml [utf8] Thu Feb 11 16:58:14 2010
@@ -2,4 +2,4 @@
  <item key="sql_clear_catalog" type="int">
   <value>1</value>
  </item>
-</catalog_method>
+</catalog_method>

Modified: erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/bt/revision?rev=32434&r1=32433&r2=32434&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/bt/revision [utf8] Thu Feb 11 16:58:14 2010
@@ -1,1 +1,1 @@
-16
+18

Added: erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/bt/template_local_role_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/bt/template_local_role_list?rev=32434&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/bt/template_portal_type_role_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/bt/template_portal_type_role_list?rev=32434&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/bt/template_registered_skin_selection_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion_mysql_innodb_catalog/bt/template_registered_skin_selection_list?rev=32434&view=auto
==============================================================================
    (empty)




More information about the Erp5-report mailing list