From f9e8034a4899576db1e3d0e147bdb578cf7f287f Mon Sep 17 00:00:00 2001
From: Mayoro Diagne <mayoro@nexedi.com>
Date: Fri, 25 Jun 2010 17:17:49 +0000
Subject: [PATCH] 2010-06-25 mayoro * modify catalog table egov and use generic
 attributes in z_catalog_egov_list and z_create_egov

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@36611 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../erp5_mysql_innodb/z_catalog_egov_list.xml | 60 +++++--------------
 .../erp5_mysql_innodb/z_create_egov.xml       | 26 +++-----
 bt5/erp5_egov/bt/change_log                   |  3 +
 bt5/erp5_egov/bt/revision                     |  2 +-
 4 files changed, 27 insertions(+), 64 deletions(-)

diff --git a/bt5/erp5_egov/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.xml b/bt5/erp5_egov/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.xml
index 50d51814d4..3965e92f8f 100644
--- a/bt5/erp5_egov/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.xml
+++ b/bt5/erp5_egov/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.xml
@@ -24,31 +24,19 @@
                         <value>
                           <dictionary>
                             <item>
-                                <key> <string>company_name</string> </key>
+                                <key> <string>getPortalType</string> </key>
                                 <value>
                                   <dictionary/>
                                 </value>
                             </item>
                             <item>
-                                <key> <string>coordonnees</string> </key>
+                                <key> <string>getTranslatedValidationStateTitle</string> </key>
                                 <value>
                                   <dictionary/>
                                 </value>
                             </item>
                             <item>
-                                <key> <string>getCorporateRegistrationCode</string> </key>
-                                <value>
-                                  <dictionary/>
-                                </value>
-                            </item>
-                            <item>
-                                <key> <string>getVatCode</string> </key>
-                                <value>
-                                  <dictionary/>
-                                </value>
-                            </item>
-                            <item>
-                                <key> <string>imposition_period</string> </key>
+                                <key> <string>modification_date</string> </key>
                                 <value>
                                   <dictionary/>
                                 </value>
@@ -59,12 +47,6 @@
                                   <dictionary/>
                                 </value>
                             </item>
-                            <item>
-                                <key> <string>unity_sector</string> </key>
-                                <value>
-                                  <dictionary/>
-                                </value>
-                            </item>
                           </dictionary>
                         </value>
                     </item>
@@ -73,12 +55,9 @@
                         <value>
                           <list>
                             <string>uid</string>
-                            <string>getCorporateRegistrationCode</string>
-                            <string>getVatCode</string>
-                            <string>company_name</string>
-                            <string>coordonnees</string>
-                            <string>imposition_period</string>
-                            <string>unity_sector</string>
+                            <string>getPortalType</string>
+                            <string>getTranslatedValidationStateTitle</string>
+                            <string>modification_date</string>
                           </list>
                         </value>
                     </item>
@@ -102,12 +81,9 @@
         <item>
             <key> <string>arguments_src</string> </key>
             <value> <string>uid\r\n
-getCorporateRegistrationCode\r\n
-getVatCode\r\n
-company_name\r\n
-coordonnees\r\n
-imposition_period\r\n
-unity_sector</string> </value>
+getPortalType\r\n
+getTranslatedValidationStateTitle\r\n
+modification_date </string> </value>
         </item>
         <item>
             <key> <string>cache_time_</string> </key>
@@ -154,12 +130,9 @@ VALUES\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
-  <dtml-sqlvar expr="company_name[loop_item]" type="string" optional>,\n
-  <dtml-sqlvar expr="coordonnees[loop_item]" type="string" optional>,\n
-  <dtml-sqlvar expr="imposition_period[loop_item]" type="string" optional>,\n
-  <dtml-sqlvar expr="unity_sector[loop_item]" type="string" optional>\n
+  <dtml-sqlvar expr="getPortalType[loop_item]" type="string" optional>,\n
+  <dtml-sqlvar expr="getTranslatedValidationStateTitle[loop_item]" type="string" optional>,\n
+  <dtml-sqlvar expr="modification_date[loop_item]" type="datetime" optional>\n
 )\n
 <dtml-if sequence-end><dtml-else>,</dtml-if>\n
   </dtml-in>\n
@@ -211,12 +184,9 @@ VALUES\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
-  <dtml-sqlvar expr="company_name[loop_item]" type="string" optional>,\n
-  <dtml-sqlvar expr="coordonnees[loop_item]" type="string" optional>,\n
-  <dtml-sqlvar expr="imposition_period[loop_item]" type="string" optional>,\n
-  <dtml-sqlvar expr="unity_sector[loop_item]" type="string" optional>\n
+  <dtml-sqlvar expr="getPortalType[loop_item]" type="string" optional>,\n
+  <dtml-sqlvar expr="getTranslatedValidationStateTitle[loop_item]" type="string" optional>,\n
+  <dtml-sqlvar expr="modification_date[loop_item]" type="datetime" optional>\n
 )\n
 <dtml-if sequence-end><dtml-else>,</dtml-if>\n
   </dtml-in>\n
diff --git a/bt5/erp5_egov/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_egov.xml b/bt5/erp5_egov/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_egov.xml
index 272c78ad5c..e2046d51cf 100644
--- a/bt5/erp5_egov/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_egov.xml
+++ b/bt5/erp5_egov/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_egov.xml
@@ -90,15 +90,10 @@
             <key> <string>src</string> </key>
             <value> <string>CREATE TABLE `egov` (\n
   `uid` BIGINT UNSIGNED NOT NULL,\n
-  `corporate_registration_code` VARCHAR(255) DEFAULT \'\',\n
-  `vat_code` VARCHAR(255) DEFAULT \'\',\n
-  `company_name` VARCHAR(255) DEFAULT \'\',\n
-  `coordonnees` VARCHAR(255) DEFAULT \'\',\n
-  `imposition_period` VARCHAR(255) DEFAULT \'\',\n
-  `unity_sector` VARCHAR(255) DEFAULT \'\',\n
-  PRIMARY KEY (`uid`),\n
-  KEY `rccm` (`corporate_registration_code`),\n
-  KEY `ninea` (`vat_code`)\n
+  `portal_type` VARCHAR(255) DEFAULT \'\',\n
+  `translated_validation_state_title` VARCHAR(255) DEFAULT \'\',\n
+  `modification_date` DATETIME,\n
+  PRIMARY KEY (`uid`)\n
 ) TYPE=InnoDB\n
 </string> </value>
         </item>
@@ -138,15 +133,10 @@
                         <key> <string>raw</string> </key>
                         <value> <string>CREATE TABLE `egov` (\n
   `uid` BIGINT UNSIGNED NOT NULL,\n
-  `corporate_registration_code` VARCHAR(255) DEFAULT \'\',\n
-  `vat_code` VARCHAR(255) DEFAULT \'\',\n
-  `company_name` VARCHAR(255) DEFAULT \'\',\n
-  `coordonnees` VARCHAR(255) DEFAULT \'\',\n
-  `imposition_period` VARCHAR(255) DEFAULT \'\',\n
-  `unity_sector` VARCHAR(255) DEFAULT \'\',\n
-  PRIMARY KEY (`uid`),\n
-  KEY `rccm` (`corporate_registration_code`),\n
-  KEY `ninea` (`vat_code`)\n
+  `portal_type` VARCHAR(255) DEFAULT \'\',\n
+  `translated_validation_state_title` VARCHAR(255) DEFAULT \'\',\n
+  `modification_date` DATETIME,\n
+  PRIMARY KEY (`uid`)\n
 ) TYPE=InnoDB\n
 </string> </value>
                     </item>
diff --git a/bt5/erp5_egov/bt/change_log b/bt5/erp5_egov/bt/change_log
index 0d43086689..4d3a354967 100644
--- a/bt5/erp5_egov/bt/change_log
+++ b/bt5/erp5_egov/bt/change_log
@@ -1,3 +1,6 @@
+2010-06-25 mayoro
+* modify catalog table egov and use generic attributes in z_catalog_egov_list and z_create_egov
+
 2010-06-25 mohamadou
 *Give anonymous access to a portal_type that does not require authentication
 
diff --git a/bt5/erp5_egov/bt/revision b/bt5/erp5_egov/bt/revision
index 24c5507b23..b697ae4122 100644
--- a/bt5/erp5_egov/bt/revision
+++ b/bt5/erp5_egov/bt/revision
@@ -1 +1 @@
-633
\ No newline at end of file
+635
\ No newline at end of file
-- 
2.30.9