From d898fb7015306f60c287a15e8a2f042559427e96 Mon Sep 17 00:00:00 2001 From: Nicolas Delaby <nicolas@nexedi.com> Date: Thu, 11 Feb 2010 15:58:14 +0000 Subject: [PATCH] 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 --- .../erp5_mysql_innodb/z0_drop_email.catalog_keys.xml | 2 +- .../erp5_mysql_innodb/z0_drop_subject.catalog_keys.xml | 2 +- .../z0_uncatalog_email.catalog_keys.xml | 10 ++++------ .../z0_uncatalog_subject.catalog_keys.xml | 7 ++++--- .../z_catalog_email_list.catalog_keys.xml | 10 ++++------ .../z_catalog_subject_list.catalog_keys.xml | 7 ++++--- .../erp5_mysql_innodb/z_create_email.catalog_keys.xml | 2 +- .../z_create_subject.catalog_keys.xml | 2 +- bt5/erp5_ingestion_mysql_innodb_catalog/bt/revision | 2 +- .../bt/template_local_role_list | 0 .../bt/template_portal_type_role_list | 0 .../bt/template_registered_skin_selection_list | 0 12 files changed, 21 insertions(+), 23 deletions(-) create mode 100644 bt5/erp5_ingestion_mysql_innodb_catalog/bt/template_local_role_list create mode 100644 bt5/erp5_ingestion_mysql_innodb_catalog/bt/template_portal_type_role_list create mode 100644 bt5/erp5_ingestion_mysql_innodb_catalog/bt/template_registered_skin_selection_list diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_email.catalog_keys.xml b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_email.catalog_keys.xml index baf9e92bd9..b0fe64af00 100644 --- a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_email.catalog_keys.xml +++ b/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> diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_subject.catalog_keys.xml b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_subject.catalog_keys.xml index baf9e92bd9..b0fe64af00 100644 --- a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_subject.catalog_keys.xml +++ b/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> diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.catalog_keys.xml b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.catalog_keys.xml index 1bd3cc6a20..7d029609c4 100644 --- a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.catalog_keys.xml +++ b/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> diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_subject.catalog_keys.xml b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_subject.catalog_keys.xml index 627550d141..f8682a9334 100644 --- a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_subject.catalog_keys.xml +++ b/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> diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.catalog_keys.xml b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.catalog_keys.xml index 809876bf47..7998db3e95 100644 --- a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.catalog_keys.xml +++ b/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> diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_subject_list.catalog_keys.xml b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_subject_list.catalog_keys.xml index 9c95597ff2..0aed3cdab6 100644 --- a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_subject_list.catalog_keys.xml +++ b/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> diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.catalog_keys.xml b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.catalog_keys.xml index baf9e92bd9..b0fe64af00 100644 --- a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.catalog_keys.xml +++ b/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> diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_subject.catalog_keys.xml b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_subject.catalog_keys.xml index baf9e92bd9..b0fe64af00 100644 --- a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_subject.catalog_keys.xml +++ b/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> diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/bt/revision b/bt5/erp5_ingestion_mysql_innodb_catalog/bt/revision index 19c7bdba7b..25bf17fc5a 100644 --- a/bt5/erp5_ingestion_mysql_innodb_catalog/bt/revision +++ b/bt5/erp5_ingestion_mysql_innodb_catalog/bt/revision @@ -1 +1 @@ -16 \ No newline at end of file +18 \ No newline at end of file diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/bt/template_local_role_list b/bt5/erp5_ingestion_mysql_innodb_catalog/bt/template_local_role_list new file mode 100644 index 0000000000..e69de29bb2 diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/bt/template_portal_type_role_list b/bt5/erp5_ingestion_mysql_innodb_catalog/bt/template_portal_type_role_list new file mode 100644 index 0000000000..e69de29bb2 diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/bt/template_registered_skin_selection_list b/bt5/erp5_ingestion_mysql_innodb_catalog/bt/template_registered_skin_selection_list new file mode 100644 index 0000000000..e69de29bb2 -- 2.30.9