remove condition because it's already tested in the filter

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

bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.xml

@@ -35,24 +35,12 @@
                                   <dictionary/>
                                 </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>
-                            </item>
                             <item>
                                 <key> <string>uid</string> </key>
                                 <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,31 +116,11 @@ getVatCode\r\n
             <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
@@ -164,8 +128,7 @@ VALUES\n
 )\n
 <dtml-if sequence-end><dtml-else>,</dtml-if>\n
   </dtml-in>\n
-  </dtml-if>\n
-</dtml-let>\n
+</dtml-if>\n
 
 
 ]]></string> </value>
@@ -206,31 +169,11 @@ VALUES\n
                         <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
@@ -238,8 +181,7 @@ VALUES\n
 )\n
 <dtml-if sequence-end><dtml-else>,</dtml-if>\n
   </dtml-in>\n
-  </dtml-if>\n
-</dtml-let>\n
+</dtml-if>\n
 
 
 ]]></string> </value>

bt5/erp5_egov_mysql_innodb_catalog/bt/revision

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