Use last catalog optimisation

* Change Tales Expression of Catalog Method Filter (context, cache_key)
Reviewed by JM

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32434 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_email.catalog_keys.xml

@@ -2,4 +2,4 @@
  <item key="sql_clear_catalog" type="int">
   <value>1</value>
  </item>
-</catalog_method>
\ No newline at end of file
+</catalog_method>

bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_subject.catalog_keys.xml

@@ -2,4 +2,4 @@
  <item key="sql_clear_catalog" type="int">
   <value>1</value>
  </item>
-</catalog_method>
\ No newline at end of file
+</catalog_method>

bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.catalog_keys.xml

@@ -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>
\ No newline at end of file
+</catalog_method>

bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_subject.catalog_keys.xml

@@ -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>
\ No newline at end of file
+</catalog_method>

bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.catalog_keys.xml

@@ -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>
\ No newline at end of file
+</catalog_method>

bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_subject_list.catalog_keys.xml

@@ -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>
\ No newline at end of file
+</catalog_method>

bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.catalog_keys.xml

@@ -2,4 +2,4 @@
  <item key="sql_clear_catalog" type="int">
   <value>1</value>
  </item>
-</catalog_method>
\ No newline at end of file
+</catalog_method>

bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_subject.catalog_keys.xml

@@ -2,4 +2,4 @@
  <item key="sql_clear_catalog" type="int">
   <value>1</value>
  </item>
-</catalog_method>
\ No newline at end of file
+</catalog_method>

bt5/erp5_ingestion_mysql_innodb_catalog/bt/revision

-16
\ No newline at end of file
+18
\ No newline at end of file