[Erp5-report] r9940 - in /erp5/trunk/bt5/erp5_dms: CatalogMethodTemplateItem/portal_catalog...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Sep 14 20:58:31 CEST 2006
Author: bartek
Date: Thu Sep 14 20:58:13 2006
New Revision: 9940
URL: http://svn.erp5.org?rev=9940&view=rev
Log:
Added language and version to catalog (compatibility), updated scripts accordingly
Added:
erp5/trunk/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_compatibility_list.catalog_keys.xml
erp5/trunk/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_compatibility_list.xml
erp5/trunk/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_compatibility.catalog_keys.xml
erp5/trunk/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_compatibility.xml
erp5/trunk/bt5/erp5_dms/CatalogResultTableTemplateItem/
erp5/trunk/bt5/erp5_dms/CatalogResultTableTemplateItem/result_table_list.xml
Modified:
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_findDocument.xml
erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/scripts/archivePublicVersion.xml
erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/scripts/archiveReleasedVersion.xml
erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/scripts/checkUniqueCoordinates.xml
erp5/trunk/bt5/erp5_dms/bt/change_log
erp5/trunk/bt5/erp5_dms/bt/revision
erp5/trunk/bt5/erp5_dms/bt/template_catalog_method_id_list
erp5/trunk/bt5/erp5_dms/bt/template_catalog_result_table_list
erp5/trunk/bt5/erp5_dms/bt/version
Added: erp5/trunk/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_compatibility_list.catalog_keys.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_compatibility_list.catalog_keys.xml?rev=9940&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_compatibility_list.catalog_keys.xml (added)
+++ erp5/trunk/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_compatibility_list.catalog_keys.xml Thu Sep 14 20:58:13 2006
@@ -1,0 +1,5 @@
+<catalog_method>
+ <item key="sql_catalog_object_list" type="int">
+ <value>1</value>
+ </item>
+</catalog_method>
Added: erp5/trunk/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_compatibility_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_compatibility_list.xml?rev=9940&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_compatibility_list.xml (added)
+++ erp5/trunk/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_compatibility_list.xml Thu Sep 14 20:58:13 2006
@@ -1,0 +1,383 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.ZSQLMethods.SQL</string>
+ <string>SQL</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_arg</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_data</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>CreationDate</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>Creator</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>Date</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>EffectiveDate</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>ExpiresDate</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>ModificationDate</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>PrincipiaSearchSource</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>SearchableText</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>Type</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>bobobase_modification_time</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>created</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>effective</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>expires</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getIcon</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>in_reply_to</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>language</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>modified</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>review_state</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>summary</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>uid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>version</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>_keys</string> </key>
+ <value>
+ <list>
+<string>uid</string>
+<string>Creator</string>
+<string>Date</string>
+<string>PrincipiaSearchSource</string>
+<string>SearchableText</string>
+<string>CreationDate</string>
+<string>EffectiveDate</string>
+<string>ExpiresDate</string>
+<string>ModificationDate</string>
+<string>Type</string>
+<string>bobobase_modification_time</string>
+<string>created</string>
+<string>effective</string>
+<string>expires</string>
+<string>getIcon</string>
+<string>in_reply_to</string>
+<string>modified</string>
+<string>review_state</string>
+<string>summary</string>
+<string>language</string>
+<string>version</string>
+ </list>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>allow_simple_one_argument_traversal</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>arguments_src</string> </key>
+ <value> <string>uid\r\n
+Creator\r\n
+Date\r\n
+PrincipiaSearchSource\r\n
+SearchableText\r\n
+CreationDate\r\n
+EffectiveDate\r\n
+ExpiresDate\r\n
+ModificationDate\r\n
+Type\r\n
+bobobase_modification_time\r\n
+created\r\n
+effective\r\n
+expires\r\n
+getIcon\r\n
+in_reply_to\r\n
+modified\r\n
+review_state\r\n
+summary\r\n
+language\r\n
+version</string> </value>
+ </item>
+ <item>
+ <key> <string>cache_time_</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>class_file_</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>class_name_</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>connection_hook</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>connection_id</string> </key>
+ <value> <string>erp5_sql_connection</string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>z_catalog_compatibility_list</string> </value>
+ </item>
+ <item>
+ <key> <string>max_cache_</string> </key>
+ <value> <int>100</int> </value>
+ </item>
+ <item>
+ <key> <string>max_rows_</string> </key>
+ <value> <int>1000</int> </value>
+ </item>
+ <item>
+ <key> <string>src</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+REPLACE INTO\n
+ compatibility\n
+VALUES\n
+<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
+(\n
+ <dtml-sqlvar expr="uid[loop_item]" type="int">, \n
+ <dtml-sqlvar expr="Creator[loop_item]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="Date[loop_item]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="PrincipiaSearchSource[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="SearchableText[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="CreationDate[loop_item]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="EffectiveDate[loop_item]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="ExpiresDate[loop_item]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="ModificationDate[loop_item]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="Type[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="bobobase_modification_time[loop_item]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="created[loop_item]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="effective[loop_item]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="expires[loop_item]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="getIcon[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="in_reply_to[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="modified[loop_item]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="review_state[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="summary[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="language[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="version[loop_item]" type="string" optional>\n
+)\n
+<dtml-if sequence-end>\n
+<dtml-else>\n
+,\n
+</dtml-if>\n
+</dtml-in>\n
+
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>template</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+ </klass>
+ <none/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>__name__</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<string>
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>_vars</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>globals</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>raw</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+REPLACE INTO\n
+ compatibility\n
+VALUES\n
+<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
+(\n
+ <dtml-sqlvar expr="uid[loop_item]" type="int">, \n
+ <dtml-sqlvar expr="Creator[loop_item]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="Date[loop_item]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="PrincipiaSearchSource[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="SearchableText[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="CreationDate[loop_item]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="EffectiveDate[loop_item]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="ExpiresDate[loop_item]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="ModificationDate[loop_item]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="Type[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="bobobase_modification_time[loop_item]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="created[loop_item]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="effective[loop_item]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="expires[loop_item]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="getIcon[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="in_reply_to[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="modified[loop_item]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="review_state[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="summary[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="language[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="version[loop_item]" type="string" optional>\n
+)\n
+<dtml-if sequence-end>\n
+<dtml-else>\n
+,\n
+</dtml-if>\n
+</dtml-in>\n
+
+
+]]></string> </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_compatibility.catalog_keys.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_compatibility.catalog_keys.xml?rev=9940&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_compatibility.catalog_keys.xml (added)
+++ erp5/trunk/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_compatibility.catalog_keys.xml Thu Sep 14 20:58:13 2006
@@ -1,0 +1,5 @@
+<catalog_method>
+ <item key="sql_clear_catalog" type="int">
+ <value>1</value>
+ </item>
+</catalog_method>
Added: erp5/trunk/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_compatibility.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_compatibility.xml?rev=9940&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_compatibility.xml (added)
+++ erp5/trunk/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_compatibility.xml Thu Sep 14 20:58:13 2006
@@ -1,0 +1,208 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.ZSQLMethods.SQL</string>
+ <string>SQL</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_arg</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_data</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_keys</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_col</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>allow_simple_one_argument_traversal</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>arguments_src</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>cache_time_</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>class_file_</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>class_name_</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>connection_hook</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>connection_id</string> </key>
+ <value> <string>erp5_sql_connection</string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>z_create_compatibility</string> </value>
+ </item>
+ <item>
+ <key> <string>max_cache_</string> </key>
+ <value> <int>100</int> </value>
+ </item>
+ <item>
+ <key> <string>max_rows_</string> </key>
+ <value> <int>1000</int> </value>
+ </item>
+ <item>
+ <key> <string>src</string> </key>
+ <value> <string># Host:\n
+# Database: test\n
+# Table: \'compatibility\'\n
+#\n
+CREATE TABLE `compatibility` (\n
+ `uid` BIGINT UNSIGNED NOT NULL,\n
+ `Creator` varchar(255) default \'\',\n
+ `Date` datetime default \'0000-00-00 00:00:00\',\n
+ `PrincipiaSearchSource` text,\n
+ `SearchableText` text,\n
+ `CreationDate` datetime default \'0000-00-00 00:00:00\',\n
+ `EffectiveDate` datetime default \'0000-00-00 00:00:00\',\n
+ `ExpiresDate` datetime default \'0000-00-00 00:00:00\',\n
+ `ModificationDate` datetime default \'0000-00-00 00:00:00\',\n
+ `Type` varchar(255) default \'\',\n
+ `bobobase_modification_time` datetime default \'0000-00-00 00:00:00\',\n
+ `created` datetime default \'0000-00-00 00:00:00\',\n
+ `effective` datetime default \'0000-00-00 00:00:00\',\n
+ `expires` datetime default \'0000-00-00 00:00:00\',\n
+ `getIcon` varchar(255) default \'\',\n
+ `in_reply_to` varchar(255) default \'\',\n
+ `modified` datetime default \'0000-00-00 00:00:00\',\n
+ `review_state` varchar(255) default \'\',\n
+ `summary` text,\n
+ `language` varchar(5) default \'\',\n
+ `version` varchar(10) default \'\',\n
+ PRIMARY KEY (`uid`),\n
+ KEY `Type` (`Type`),\n
+ KEY `review_state` (`review_state`)\n
+) TYPE=InnoDB;\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>template</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+ </klass>
+ <none/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>__name__</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<string>
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>_vars</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>globals</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>raw</string> </key>
+ <value> <string># Host:\n
+# Database: test\n
+# Table: \'compatibility\'\n
+#\n
+CREATE TABLE `compatibility` (\n
+ `uid` BIGINT UNSIGNED NOT NULL,\n
+ `Creator` varchar(255) default \'\',\n
+ `Date` datetime default \'0000-00-00 00:00:00\',\n
+ `PrincipiaSearchSource` text,\n
+ `SearchableText` text,\n
+ `CreationDate` datetime default \'0000-00-00 00:00:00\',\n
+ `EffectiveDate` datetime default \'0000-00-00 00:00:00\',\n
+ `ExpiresDate` datetime default \'0000-00-00 00:00:00\',\n
+ `ModificationDate` datetime default \'0000-00-00 00:00:00\',\n
+ `Type` varchar(255) default \'\',\n
+ `bobobase_modification_time` datetime default \'0000-00-00 00:00:00\',\n
+ `created` datetime default \'0000-00-00 00:00:00\',\n
+ `effective` datetime default \'0000-00-00 00:00:00\',\n
+ `expires` datetime default \'0000-00-00 00:00:00\',\n
+ `getIcon` varchar(255) default \'\',\n
+ `in_reply_to` varchar(255) default \'\',\n
+ `modified` datetime default \'0000-00-00 00:00:00\',\n
+ `review_state` varchar(255) default \'\',\n
+ `summary` text,\n
+ `language` varchar(5) default \'\',\n
+ `version` varchar(10) default \'\',\n
+ PRIMARY KEY (`uid`),\n
+ KEY `Type` (`Type`),\n
+ KEY `review_state` (`review_state`)\n
+) TYPE=InnoDB;\n
+</string> </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_dms/CatalogResultTableTemplateItem/result_table_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/CatalogResultTableTemplateItem/result_table_list.xml?rev=9940&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_dms/CatalogResultTableTemplateItem/result_table_list.xml (added)
+++ erp5/trunk/bt5/erp5_dms/CatalogResultTableTemplateItem/result_table_list.xml Thu Sep 14 20:58:13 2006
@@ -1,0 +1,4 @@
+<key_list>
+ <key>compatibility</key>
+ <key>email</key>
+</key_list>
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_findDocument.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_findDocument.xml?rev=9940&r1=9939&r2=9940&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_findDocument.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_findDocument.xml Thu Sep 14 20:58:13 2006
@@ -76,16 +76,13 @@
# ref[1] is a dict of values from parsed reference string\n
context.log(script.getId(),ref)\n
reference=ref[1][\'reference\']\n
-res=context.portal_catalog(reference=reference,portal_type=context.getPortalDocumentTypeList())\n
-res=[r.getObject() for r in res]\n
-context.log(\'res\',res)\n
+searchargs=dict(reference=reference,portal_type=context.getPortalDocumentTypeList(),sort_on=\'version\')\n
lng=ref[1].get(\'language\')\n
context.log(\'lng\',lng)\n
if lng is not None:\n
- res=filter(lambda o:o.getLanguage()==lng,res)\n
-context.log(\'res\',res)\n
-res.sort(key=lambda o:o.getVersion(),reverse=True)\n
-context.log(\'res\',res)\n
+ searchargs[\'language\']=lng\n
+res=context.portal_catalog(**searchargs)\n
+res.reverse() # can catalog do reverse sorting?\n
return res\n
</string> </value>
</item>
@@ -135,15 +132,13 @@
<string>script</string>
<string>_getitem_</string>
<string>reference</string>
- <string>res</string>
- <string>append</string>
- <string>$append0</string>
- <string>_getiter_</string>
- <string>r</string>
+ <string>dict</string>
+ <string>searchargs</string>
<string>lng</string>
<string>None</string>
- <string>filter</string>
- <string>True</string>
+ <string>_write_</string>
+ <string>_apply_</string>
+ <string>res</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/scripts/archivePublicVersion.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/scripts/archivePublicVersion.xml?rev=9940&r1=9939&r2=9940&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/scripts/archivePublicVersion.xml (original)
+++ erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/scripts/archivePublicVersion.xml Thu Sep 14 20:58:13 2006
@@ -75,10 +75,8 @@
lng=o.getLanguage()\n
if lng is None: # ibidem\n
raise Exception(\'how on earth can language be None?\')\n
-res=context.portal_catalog(reference=ref,portal_type=o.getPortalType(),simulation_state=\'published\')\n
-res=[r.getObject() for r in res]\n
-res=filter(lambda o:o.getLanguage()==lng,res)\n
-for ob in res: # again, this should never happen, but still\n
+res=context.portal_catalog(reference=ref,language=lng,simulation_state=\'published\')\n
+for ob in [r.getObject() for r in res]: # again, this should never happen, but still\n
o.portal_workflow.doActionFor(ob,\'archive_action\')\n
</string> </value>
</item>
@@ -131,11 +129,10 @@
<string>lng</string>
<string>context</string>
<string>res</string>
+ <string>_getiter_</string>
<string>append</string>
<string>$append0</string>
- <string>_getiter_</string>
<string>r</string>
- <string>filter</string>
<string>ob</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/scripts/archiveReleasedVersion.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/scripts/archiveReleasedVersion.xml?rev=9940&r1=9939&r2=9940&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/scripts/archiveReleasedVersion.xml (original)
+++ erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/scripts/archiveReleasedVersion.xml Thu Sep 14 20:58:13 2006
@@ -75,10 +75,8 @@
lng=o.getLanguage()\n
if lng is None: # ibidem\n
raise Exception(\'how on earth can language be None?\')\n
-res=context.portal_catalog(reference=ref,portal_type=o.getPortalType(),simulation_state=\'released\')\n
-res=[r.getObject() for r in res]\n
-res=filter(lambda o:o.getLanguage()==lng,res)\n
-for ob in res: # again, this should never happen, but still\n
+res=context.portal_catalog(reference=ref,language=lng,simulation_state=\'released\')\n
+for ob in [r.getObject() for r in res]: # again, this should never happen, but still\n
o.portal_workflow.doActionFor(ob,\'archive_action\')\n
</string> </value>
</item>
@@ -131,11 +129,10 @@
<string>lng</string>
<string>context</string>
<string>res</string>
+ <string>_getiter_</string>
<string>append</string>
<string>$append0</string>
- <string>_getiter_</string>
<string>r</string>
- <string>filter</string>
<string>ob</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/scripts/checkUniqueCoordinates.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/scripts/checkUniqueCoordinates.xml?rev=9940&r1=9939&r2=9940&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/scripts/checkUniqueCoordinates.xml (original)
+++ erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/scripts/checkUniqueCoordinates.xml Thu Sep 14 20:58:13 2006
@@ -79,9 +79,8 @@
err+=\'E: %s is None \' % req\n
if err:\n
raise ValidationFailed(err)\n
-res=context.portal_catalog(reference=o.getReference())\n
-res=[r.getObject() for r in res]\n
-res=filter(lambda r:r.getLanguage()==o.getLanguage() and r.getVersion()==o.getVersion(),res)\n
+res=context.portal_catalog(reference=o.getReference(),language=o.getLanguage(),version=o.getVersion(),portal_type=context.getPortalDocumentTypeList())\n
+res=list(res)\n
if len(res)==2: # this and the other one\n
raise ValidationFailed(\'E: another object %s - %s - %s exists\' % (o.getReference(),o.getLanguage(),o.getVersion()))\n
if len(res)>2:\n
@@ -141,10 +140,7 @@
<string>None</string>
<string>context</string>
<string>res</string>
- <string>append</string>
- <string>$append0</string>
- <string>r</string>
- <string>filter</string>
+ <string>list</string>
<string>len</string>
<string>Exception</string>
</tuple>
Modified: erp5/trunk/bt5/erp5_dms/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/change_log?rev=9940&r1=9939&r2=9940&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_dms/bt/change_log Thu Sep 14 20:58:13 2006
@@ -1,5 +1,6 @@
2006-09-14
Fixed some bugs and controls, implemented publication workflow side effects, check unique identifier upon submission.
+Added language and version to catalog (compatibility), updated scripts accordingly
2006-09-12
First implementation of External Document (a web page, spidered and cached)
Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=9940&r1=9939&r2=9940&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision Thu Sep 14 20:58:13 2006
@@ -1,1 +1,1 @@
-153
+157
Modified: erp5/trunk/bt5/erp5_dms/bt/template_catalog_method_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/template_catalog_method_id_list?rev=9940&r1=9939&r2=9940&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/template_catalog_method_id_list (original)
+++ erp5/trunk/bt5/erp5_dms/bt/template_catalog_method_id_list Thu Sep 14 20:58:13 2006
@@ -1,4 +1,6 @@
erp5_mysql/z0_drop_email
erp5_mysql/z0_uncatalog_email
+erp5_mysql/z_catalog_compatibility_list
erp5_mysql/z_catalog_email_list
+erp5_mysql/z_create_compatibility
erp5_mysql/z_create_email
Modified: erp5/trunk/bt5/erp5_dms/bt/template_catalog_result_table_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/template_catalog_result_table_list?rev=9940&r1=9939&r2=9940&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/template_catalog_result_table_list (original)
+++ erp5/trunk/bt5/erp5_dms/bt/template_catalog_result_table_list Thu Sep 14 20:58:13 2006
@@ -1,0 +1,2 @@
+compatibility
+email
Modified: erp5/trunk/bt5/erp5_dms/bt/version
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/version?rev=9940&r1=9939&r2=9940&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/version (original)
+++ erp5/trunk/bt5/erp5_dms/bt/version Thu Sep 14 20:58:13 2006
@@ -1,1 +1,1 @@
-0.73
+0.74
More information about the Erp5-report
mailing list