Commit 1dfc902d authored by Vincent Pelletier's avatar Vincent Pelletier

Index simulation state of inventories, to be able to skip non-validated ones.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16447 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 910bbe2d
...@@ -47,6 +47,12 @@ ...@@ -47,6 +47,12 @@
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item>
<key> <string>getSimulationState</string> </key>
<value>
<dictionary/>
</value>
</item>
<item> <item>
<key> <string>getStartDate</string> </key> <key> <string>getStartDate</string> </key>
<value> <value>
...@@ -85,6 +91,7 @@ ...@@ -85,6 +91,7 @@
<string>getDestinationPaymentUid</string> <string>getDestinationPaymentUid</string>
<string>getStartDate</string> <string>getStartDate</string>
<string>isFullInventory</string> <string>isFullInventory</string>
<string>getSimulationState</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -107,7 +114,8 @@ getDestinationUid\r\n ...@@ -107,7 +114,8 @@ getDestinationUid\r\n
getDestinationSectionUid\r\n getDestinationSectionUid\r\n
getDestinationPaymentUid\r\n getDestinationPaymentUid\r\n
getStartDate\r\n getStartDate\r\n
isFullInventory</string> </value> isFullInventory\r\n
getSimulationState</string> </value>
</item> </item>
<item> <item>
<key> <string>connection_id</string> </key> <key> <string>connection_id</string> </key>
...@@ -132,7 +140,8 @@ isFullInventory</string> </value> ...@@ -132,7 +140,8 @@ isFullInventory</string> </value>
getDestinationSectionUid[loop_item],\n getDestinationSectionUid[loop_item],\n
getDestinationPaymentUid[loop_item],\n getDestinationPaymentUid[loop_item],\n
getStartDate[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-if>\n </dtml-if>\n
</dtml-in>\n </dtml-in>\n
...@@ -140,7 +149,7 @@ isFullInventory</string> </value> ...@@ -140,7 +149,7 @@ isFullInventory</string> </value>
<dtml-if expr="len(row_list)">\n <dtml-if expr="len(row_list)">\n
REPLACE INTO\n REPLACE INTO\n
inventory\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 VALUES\n
<dtml-in prefix="row" expr="row_list">\n <dtml-in prefix="row" expr="row_list">\n
(<dtml-sqlvar expr="row_item[0]" type="int">,\n (<dtml-sqlvar expr="row_item[0]" type="int">,\n
...@@ -148,7 +157,8 @@ VALUES\n ...@@ -148,7 +157,8 @@ VALUES\n
<dtml-sqlvar expr="row_item[2]" type="int" optional>,\n <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[3]" type="int" optional>,\n
<dtml-sqlvar expr="row_item[4]" type="datetime">,\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-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>\n </dtml-in>\n
</dtml-if>\n </dtml-if>\n
...@@ -203,7 +213,8 @@ VALUES\n ...@@ -203,7 +213,8 @@ VALUES\n
getDestinationSectionUid[loop_item],\n getDestinationSectionUid[loop_item],\n
getDestinationPaymentUid[loop_item],\n getDestinationPaymentUid[loop_item],\n
getStartDate[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-if>\n </dtml-if>\n
</dtml-in>\n </dtml-in>\n
...@@ -211,7 +222,7 @@ VALUES\n ...@@ -211,7 +222,7 @@ VALUES\n
<dtml-if expr="len(row_list)">\n <dtml-if expr="len(row_list)">\n
REPLACE INTO\n REPLACE INTO\n
inventory\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 VALUES\n
<dtml-in prefix="row" expr="row_list">\n <dtml-in prefix="row" expr="row_list">\n
(<dtml-sqlvar expr="row_item[0]" type="int">,\n (<dtml-sqlvar expr="row_item[0]" type="int">,\n
...@@ -219,7 +230,8 @@ VALUES\n ...@@ -219,7 +230,8 @@ VALUES\n
<dtml-sqlvar expr="row_item[2]" type="int" optional>,\n <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[3]" type="int" optional>,\n
<dtml-sqlvar expr="row_item[4]" type="datetime">,\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-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>\n </dtml-in>\n
</dtml-if>\n </dtml-if>\n
......
...@@ -69,10 +69,11 @@ ...@@ -69,10 +69,11 @@
`payment_uid` BIGINT(20) UNSIGNED NULL,\n `payment_uid` BIGINT(20) UNSIGNED NULL,\n
`date` DATETIME NOT NULL,\n `date` DATETIME NOT NULL,\n
`is_full_inventory` BOOL NOT NULL DEFAULT FALSE,\n `is_full_inventory` BOOL NOT NULL DEFAULT FALSE,\n
`simulation_state` VARCHAR(255) NOT NULL DEFAULT \'\',\n
PRIMARY KEY `uid` (`uid`),\n PRIMARY KEY `uid` (`uid`),\n
KEY `node_index` (`is_full_inventory`, `node_uid`),\n KEY `node_index` (`is_full_inventory`, `simulation_state`, `node_uid`),\n
KEY `section_index` (`is_full_inventory`, `section_uid`),\n KEY `section_index` (`is_full_inventory`, `simulation_state`, `section_uid`),\n
KEY `payment_index` (`is_full_inventory`, `payment_uid`)\n KEY `payment_index` (`is_full_inventory`, `simulation_state`, `payment_uid`)\n
) ENGINE=InnoDB</string> </value> ) ENGINE=InnoDB</string> </value>
</item> </item>
<item> <item>
...@@ -116,10 +117,11 @@ ...@@ -116,10 +117,11 @@
`payment_uid` BIGINT(20) UNSIGNED NULL,\n `payment_uid` BIGINT(20) UNSIGNED NULL,\n
`date` DATETIME NOT NULL,\n `date` DATETIME NOT NULL,\n
`is_full_inventory` BOOL NOT NULL DEFAULT FALSE,\n `is_full_inventory` BOOL NOT NULL DEFAULT FALSE,\n
`simulation_state` VARCHAR(255) NOT NULL DEFAULT \'\',\n
PRIMARY KEY `uid` (`uid`),\n PRIMARY KEY `uid` (`uid`),\n
KEY `node_index` (`is_full_inventory`, `node_uid`),\n KEY `node_index` (`is_full_inventory`, `simulation_state`, `node_uid`),\n
KEY `section_index` (`is_full_inventory`, `section_uid`),\n KEY `section_index` (`is_full_inventory`, `simulation_state`, `section_uid`),\n
KEY `payment_index` (`is_full_inventory`, `payment_uid`)\n KEY `payment_index` (`is_full_inventory`, `simulation_state`, `payment_uid`)\n
) ENGINE=InnoDB</string> </value> ) ENGINE=InnoDB</string> </value>
</item> </item>
</dictionary> </dictionary>
......
81 82
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment