[Erp5-report] r16447 - in /erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog: Ca...

nobody at svn.erp5.org nobody at svn.erp5.org
Tue Sep 18 14:46:35 CEST 2007


Author: vincent
Date: Tue Sep 18 14:46:34 2007
New Revision: 16447

URL: http://svn.erp5.org?rev=16447&view=rev
Log:
Index simulation state of inventories, to be able to skip non-validated ones.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_inventory_list.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_inventory.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_inventory_list.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_inventory_list.xml?rev=16447&r1=16446&r2=16447&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_inventory_list.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_inventory_list.xml Tue Sep 18 14:46:34 2007
@@ -48,6 +48,12 @@
                                 </value>
                             </item>
                             <item>
+                                <key> <string>getSimulationState</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
+                            <item>
                                 <key> <string>getStartDate</string> </key>
                                 <value>
                                   <dictionary/>
@@ -85,6 +91,7 @@
 <string>getDestinationPaymentUid</string>
 <string>getStartDate</string>
 <string>isFullInventory</string>
+<string>getSimulationState</string>
                           </list>
                         </value>
                     </item>
@@ -107,7 +114,8 @@
 getDestinationSectionUid\r\n
 getDestinationPaymentUid\r\n
 getStartDate\r\n
-isFullInventory</string> </value>
+isFullInventory\r\n
+getSimulationState</string> </value>
         </item>
         <item>
             <key> <string>connection_id</string> </key>
@@ -132,7 +140,8 @@
          getDestinationSectionUid[loop_item],\n
          getDestinationPaymentUid[loop_item],\n
          getStartDate[loop_item],\n
-         isFullInventory[loop_item]))">\n
+         isFullInventory[loop_item],\n
+         getSimulationState[loop_item]))">\n
     </dtml-if>\n
   </dtml-if>\n
 </dtml-in>\n
@@ -140,7 +149,7 @@
 <dtml-if expr="len(row_list)">\n
 REPLACE INTO\n
   inventory\n
-  (`uid`, `node_uid`, `section_uid`, `payment_uid`, `date`, `is_full_inventory`)\n
+  (`uid`, `node_uid`, `section_uid`, `payment_uid`, `date`, `is_full_inventory`, `simulation_state`)\n
 VALUES\n
 <dtml-in prefix="row" expr="row_list">\n
   (<dtml-sqlvar expr="row_item[0]" type="int">,\n
@@ -148,7 +157,8 @@
    <dtml-sqlvar expr="row_item[2]" type="int" optional>,\n
    <dtml-sqlvar expr="row_item[3]" type="int" optional>,\n
    <dtml-sqlvar expr="row_item[4]" type="datetime">,\n
-   <dtml-sqlvar expr="row_item[5] or 0" type="int">\n
+   <dtml-sqlvar expr="row_item[5] or 0" type="int">,\n
+   <dtml-sqlvar expr="row_item[6]" type="string">\n
   )<dtml-if sequence-end><dtml-else>,</dtml-if>\n
 </dtml-in>\n
 </dtml-if>\n
@@ -203,7 +213,8 @@
          getDestinationSectionUid[loop_item],\n
          getDestinationPaymentUid[loop_item],\n
          getStartDate[loop_item],\n
-         isFullInventory[loop_item]))">\n
+         isFullInventory[loop_item],\n
+         getSimulationState[loop_item]))">\n
     </dtml-if>\n
   </dtml-if>\n
 </dtml-in>\n
@@ -211,7 +222,7 @@
 <dtml-if expr="len(row_list)">\n
 REPLACE INTO\n
   inventory\n
-  (`uid`, `node_uid`, `section_uid`, `payment_uid`, `date`, `is_full_inventory`)\n
+  (`uid`, `node_uid`, `section_uid`, `payment_uid`, `date`, `is_full_inventory`, `simulation_state`)\n
 VALUES\n
 <dtml-in prefix="row" expr="row_list">\n
   (<dtml-sqlvar expr="row_item[0]" type="int">,\n
@@ -219,7 +230,8 @@
    <dtml-sqlvar expr="row_item[2]" type="int" optional>,\n
    <dtml-sqlvar expr="row_item[3]" type="int" optional>,\n
    <dtml-sqlvar expr="row_item[4]" type="datetime">,\n
-   <dtml-sqlvar expr="row_item[5] or 0" type="int">\n
+   <dtml-sqlvar expr="row_item[5] or 0" type="int">,\n
+   <dtml-sqlvar expr="row_item[6]" type="string">\n
   )<dtml-if sequence-end><dtml-else>,</dtml-if>\n
 </dtml-in>\n
 </dtml-if>\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_inventory.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_inventory.xml?rev=16447&r1=16446&r2=16447&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_inventory.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_inventory.xml Tue Sep 18 14:46:34 2007
@@ -69,10 +69,11 @@
   `payment_uid`       BIGINT(20) UNSIGNED NULL,\n
   `date`              DATETIME            NOT NULL,\n
   `is_full_inventory` BOOL                NOT NULL DEFAULT FALSE,\n
+  `simulation_state`  VARCHAR(255) NOT NULL DEFAULT \'\',\n
   PRIMARY KEY `uid` (`uid`),\n
-  KEY `node_index` (`is_full_inventory`, `node_uid`),\n
-  KEY `section_index` (`is_full_inventory`, `section_uid`),\n
-  KEY `payment_index` (`is_full_inventory`, `payment_uid`)\n
+  KEY `node_index` (`is_full_inventory`, `simulation_state`, `node_uid`),\n
+  KEY `section_index` (`is_full_inventory`, `simulation_state`, `section_uid`),\n
+  KEY `payment_index` (`is_full_inventory`, `simulation_state`, `payment_uid`)\n
 ) ENGINE=InnoDB</string> </value>
         </item>
         <item>
@@ -116,10 +117,11 @@
   `payment_uid`       BIGINT(20) UNSIGNED NULL,\n
   `date`              DATETIME            NOT NULL,\n
   `is_full_inventory` BOOL                NOT NULL DEFAULT FALSE,\n
+  `simulation_state`  VARCHAR(255) NOT NULL DEFAULT \'\',\n
   PRIMARY KEY `uid` (`uid`),\n
-  KEY `node_index` (`is_full_inventory`, `node_uid`),\n
-  KEY `section_index` (`is_full_inventory`, `section_uid`),\n
-  KEY `payment_index` (`is_full_inventory`, `payment_uid`)\n
+  KEY `node_index` (`is_full_inventory`, `simulation_state`, `node_uid`),\n
+  KEY `section_index` (`is_full_inventory`, `simulation_state`, `section_uid`),\n
+  KEY `payment_index` (`is_full_inventory`, `simulation_state`, `payment_uid`)\n
 ) ENGINE=InnoDB</string> </value>
                     </item>
                   </dictionary>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision?rev=16447&r1=16446&r2=16447&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision Tue Sep 18 14:46:34 2007
@@ -1,1 +1,1 @@
-81
+82




More information about the Erp5-report mailing list