[Erp5-report] r21692 - in /erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog: CatalogMethodTemp...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Jun 18 18:03:16 CEST 2008
Author: fabien
Date: Wed Jun 18 18:03:11 2008
New Revision: 21692
URL: http://svn.erp5.org?rev=21692&view=rev
Log:
remove condition because it's already tested in the filter
Modified:
erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.xml
erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/bt/revision
Modified: erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.xml?rev=21692&r1=21691&r2=21692&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.xml (original)
+++ erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.xml Wed Jun 18 18:03:11 2008
@@ -36,19 +36,7 @@
</value>
</item>
<item>
- <key> <string>getPortalType</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
<key> <string>getVatCode</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isPortalContent</string> </key>
<value>
<dictionary/>
</value>
@@ -66,8 +54,6 @@
<key> <string>_keys</string> </key>
<value>
<list>
-<string>isPortalContent</string>
-<string>getPortalType</string>
<string>uid</string>
<string>getCorporateRegistrationCode</string>
<string>getVatCode</string>
@@ -87,9 +73,7 @@
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>isPortalContent\r\n
-getPortalType\r\n
-uid\r\n
+ <value> <string>uid\r\n
getCorporateRegistrationCode\r\n
getVatCode\r\n
</string> </value>
@@ -132,40 +116,19 @@
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-let egov_list="[]">\n
- <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
- <dtml-if "isPortalContent[loop_item] and getPortalType[loop_item] in (\'M0\',\n
- \'M0 Bis\', \n
- \'M2\', \n
- \'M2 Bis\', \n
- \'M4\', \n
- \'P0\', \n
- \'P2\', \n
- \'P4\', \n
- \'S1\', \n
- \'S5\', \n
- \'Subscription Form\', \n
- \'Declaration TVA\',\n
- \'Mandate Form\', \n
- \'Assignment\',\n
- \'Organisation\')">\n
- <dtml-call expr="egov_list.append(loop_item)">\n
- </dtml-if>\n
- </dtml-in>\n
- <dtml-if expr="_.len(egov_list) > 0">\n
+<dtml-if expr="_.len(_.range(_.len(uid))) > 0">\n
REPLACE INTO\n
egov\n
VALUES\n
- <dtml-in prefix="loop" expr="egov_list">\n
+ <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
( \n
<dtml-sqlvar expr="uid[loop_item]" type="int">,\n
<dtml-sqlvar expr="getCorporateRegistrationCode[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getVatCode[loop_item]" type="string" optional>\n
)\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n
- </dtml-in>\n
- </dtml-if>\n
-</dtml-let>\n
+ </dtml-in>\n
+</dtml-if>\n
]]></string> </value>
@@ -206,40 +169,19 @@
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-let egov_list="[]">\n
- <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
- <dtml-if "isPortalContent[loop_item] and getPortalType[loop_item] in (\'M0\',\n
- \'M0 Bis\', \n
- \'M2\', \n
- \'M2 Bis\', \n
- \'M4\', \n
- \'P0\', \n
- \'P2\', \n
- \'P4\', \n
- \'S1\', \n
- \'S5\', \n
- \'Subscription Form\', \n
- \'Declaration TVA\',\n
- \'Mandate Form\', \n
- \'Assignment\',\n
- \'Organisation\')">\n
- <dtml-call expr="egov_list.append(loop_item)">\n
- </dtml-if>\n
- </dtml-in>\n
- <dtml-if expr="_.len(egov_list) > 0">\n
+<dtml-if expr="_.len(_.range(_.len(uid))) > 0">\n
REPLACE INTO\n
egov\n
VALUES\n
- <dtml-in prefix="loop" expr="egov_list">\n
+ <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
( \n
<dtml-sqlvar expr="uid[loop_item]" type="int">,\n
<dtml-sqlvar expr="getCorporateRegistrationCode[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getVatCode[loop_item]" type="string" optional>\n
)\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n
- </dtml-in>\n
- </dtml-if>\n
-</dtml-let>\n
+ </dtml-in>\n
+</dtml-if>\n
]]></string> </value>
Modified: erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/bt/revision?rev=21692&r1=21691&r2=21692&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/bt/revision (original)
+++ erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/bt/revision Wed Jun 18 18:03:11 2008
@@ -1,1 +1,1 @@
-2
+16
More information about the Erp5-report
mailing list