Added SortIndex fields to Catalog, and updated methods.

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

product/ERP5Catalog/sql/erp5_mysql/z0_catalog_object.zsql

@@ -33,34 +33,35 @@ meta_type
 getPortalType
 modified
 review_state
-sales_state
-modele_state
+opportunity_state
 summary
 getDefaultSourceReference
-getFormeId
-getGammeId
 getDefaultDestinationReference
 getDefaultSourceTitle
 getDefaultDestinationTitle
 getDefaultSourceSectionTitle
 getDefaultDestinationSectionTitle
 getDefaultCausalityId
-modele_state_modeliste
-modele_state_gestionaire
-forme_state
-composant_state
-vetement_state
-transform_state
-order_state
-delivery_state
+getLocation
+getEan13Code
 getSimulationState
 causality_state
 discussion_state
+invoice_state
 getOrderId
-samples_delivery_check
-modele_state_infos_client
-modele_state_accord_technique</params>
-INSERT INTO catalog VALUES ( 
+validation_state
+payment_state
+event_state
+getReference
+getSourceReference
+getDestinationReference
+getStringIndex
+getIntIndex
+getFloatIndex
+getStringIndex2
+getIntIndex2
+getFloatIndex2</params>
+INSERT INTO catalog VALUES (
   <dtml-sqlvar uid type="int">,
   <dtml-sqlvar getPath type="string">,
   <dtml-sqlvar getRelativeUrl type="string">,
@@ -87,31 +88,32 @@ INSERT INTO catalog VALUES (
   <dtml-sqlvar getPortalType type="string">,
   <dtml-sqlvar modified  type="string">,
   <dtml-sqlvar review_state type="string">,
-  <dtml-sqlvar sales_state type="string">,
-  <dtml-sqlvar modele_state type="string">,
+  <dtml-sqlvar opportunity_state type="string">,
   <dtml-sqlvar getDefaultSourceReference type="string">,
-  <dtml-sqlvar getFormeId type="string">,
-  <dtml-sqlvar getGammeId type="string">,
   <dtml-sqlvar getDefaultDestinationReference type="string">,
   <dtml-sqlvar getDefaultSourceTitle type="string">,
   <dtml-sqlvar getDefaultDestinationTitle type="string">,
   <dtml-sqlvar getDefaultSourceSectionTitle type="string">,
   <dtml-sqlvar getDefaultDestinationSectionTitle type="string">,
   <dtml-sqlvar getDefaultCausalityId type="string">,
-  <dtml-sqlvar modele_state_modeliste type="string">,
-  <dtml-sqlvar modele_state_gestionaire type="string">,
-  <dtml-sqlvar forme_state type="string">,
-  <dtml-sqlvar composant_state type="string">,
-  <dtml-sqlvar vetement_state type="string">,
-  <dtml-sqlvar transform_state type="string">,
-  <dtml-sqlvar order_state type="string">,
-  <dtml-sqlvar delivery_state type="string">,
+  <dtml-sqlvar getLocation type="string">,
+  <dtml-sqlvar getEan13Code type="string">,
+  <dtml-sqlvar validation_state type="string">,
+  <dtml-sqlvar payment_state type="string">,
+  <dtml-sqlvar event_state type="string">,
   <dtml-sqlvar getSimulationState type="string">,
   <dtml-sqlvar causality_state type="string">,
   <dtml-sqlvar discussion_state type="string">,
+  <dtml-sqlvar invoice_state type="string">,
   <dtml-sqlvar getOrderId type="string">,
-  <dtml-if samples_delivery_check>1<dtml-else>0</dtml-if>,
-  <dtml-sqlvar modele_state_infos_client type="string">,
-  <dtml-sqlvar modele_state_accord_technique type="string">,
-  <dtml-sqlvar summary  type="string">
-);
\ No newline at end of file
+  <dtml-sqlvar getReference  type="string">,
+  <dtml-sqlvar getSourceReference  type="string">,
+  <dtml-sqlvar getDestinationReference  type="string">,
+  <dtml-sqlvar summary  type="string">,
+  <dtml-sqlvar getStringIndex  type="string">,
+  <dtml-sqlvar getIntIndex  type="int">,
+  <dtml-sqlvar getFloatIndex  type="float">,
+  <dtml-sqlvar getStringIndex2  type="string">,
+  <dtml-sqlvar getIntIndex2  type="int">,
+  <dtml-sqlvar getFloatIndex2  type="float">
+);

product/ERP5Catalog/sql/erp5_mysql/z_create_catalog.zsql

@@ -62,6 +62,12 @@ CREATE TABLE `catalog` (
   `source_reference` varchar(30) default '',
   `destination_reference` varchar(30) default '',
   `summary` text,
+  `string_index` varchar(30),
+  `int_index` int(11),
+  `float_index` real,
+  `string_index2` varchar(30),
+  `int_index2` int(11),
+  `float_index2` real,
   PRIMARY KEY  (`uid`),
   KEY `security_uid` (`security_uid`),
   KEY `Parent` (`parent_uid`),

product/ERP5Catalog/sql/erp5_mysql/z_create_movement.zsql

@@ -8,10 +8,10 @@ class_name:
 class_file:
 </dtml-comment>
 <params></params>
-# Host: 
+# Host:
 # Database: test
 # Table: 'movement'
-# 
+#
 CREATE TABLE `movement` (
   `uid` int(11) default '0',
   `delivery_uid` int(11) default '0',
@@ -34,6 +34,7 @@ CREATE TABLE `movement` (
   `is_deliverable` bool,
   `variation_text` VARCHAR(100),
   KEY `uid` (`uid`),
+  KEY `delivery_uid` (`delivery_uid`),
   KEY `source_uid` (`source_uid`),
   KEY `destination_uid` (`destination_uid`),
   KEY `resource_uid` (`resource_uid`),
@@ -42,4 +43,4 @@ CREATE TABLE `movement` (
   KEY `is_orderable` (`is_orderable`),
   KEY `is_deliverable` (`is_deliverable`),
   KEY `variation_text` (`variation_text`)
-) TYPE=InnoDB; 
+) TYPE=InnoDB;

product/ERP5Catalog/sql/erp5_mysql/z_create_stock.zsql

@@ -8,17 +8,24 @@ class_name:
 class_file:
 </dtml-comment>
 <params></params>
-# Host: 
+# Host:
 # Database: test
 # Table: 'stock'
-# 
+#
 CREATE TABLE `stock` (
   `uid` int(11) NOT NULL default '0',
-  `node_uid` int(11), 
-  `section_uid` int(11), 
- `quantity` real ,
+  `node_uid` int(11),
+  `section_uid` int(11),
+  `mirror_section_uid` int(11),
+  `resource_uid` int(11),
+  `quantity` real ,
+  `total_asset_price` real ,
   KEY `uid` (`uid`),
   KEY `quantity` (`quantity`),
   KEY `section_uid` (`section_uid`),
-  KEY `node_uid` (`node_uid`)
-) TYPE = InnoDB; 
+  KEY `mirror_section_uid` (`mirror_section_uid`),
+  KEY `node_uid` (`node_uid`),
+  KEY `resource_uid` (`resource_uid`),
+  KEY `resource_node_uid` (`resource_uid`, `node_uid`),
+  KEY `resource_section_node_uid` (`resource_uid`, `section_uid`, `node_uid`)
+) TYPE = InnoDB;

product/ERP5Catalog/sql/erp5_mysql/z_update_object.zsql

@@ -56,14 +56,20 @@ event_state
 getReference
 getSourceReference
 getDestinationReference
-insert_catalog_line</params>
+insert_catalog_line
+getStringIndex
+getIntIndex
+getFloatIndex
+getStringIndex2
+getIntIndex2
+getFloatIndex2</params>
 <dtml-if insert_catalog_line>
 INSERT INTO catalog(uid) VALUES (<dtml-sqlvar uid type="int">);
 
 <dtml-var "'\0'">
 
 </dtml-if>
-UPDATE catalog SET   uid=<dtml-sqlvar uid type="int">,
+UPDATE catalog SET uid=<dtml-sqlvar uid type="int">,
   security_uid=<dtml-sqlvar security_uid type="int">,
   path=<dtml-sqlvar getPath type="string">,
   relative_url=<dtml-sqlvar getRelativeUrl type="string">,
@@ -71,24 +77,24 @@ UPDATE catalog SET   uid=<dtml-sqlvar uid type="int">,
   CreationDate=<dtml-sqlvar CreationDate type="string">,
   Creator=<dtml-sqlvar Creator type="string">,
   Date=<dtml-sqlvar Date type="string">,
-  Description=<dtml-sqlvar getDescription  type="string">,
+  Description=<dtml-sqlvar getDescription type="string">,
   PrincipiaSearchSource=<dtml-sqlvar PrincipiaSearchSource type="string">,
-  SearchableText=<dtml-sqlvar SearchableText  type="string">,
-  EffectiveDate=<dtml-sqlvar EffectiveDate   type="string">,
-  ExpiresDate=<dtml-sqlvar ExpiresDate    type="string">,
-  ModificationDate=<dtml-sqlvar ModificationDate     type="string">,
-  Title=<dtml-sqlvar getTitle     type="string">,
-  Type=<dtml-sqlvar Type  type="string">,
-  bobobase_modification_time=<dtml-sqlvar bobobase_modification_time  type="string">,
-  created=<dtml-sqlvar created  type="string">,
-  effective=<dtml-sqlvar effective   type="string">,
-  expires=<dtml-sqlvar expires   type="string">,
-  getIcon=<dtml-sqlvar getIcon  type="string">,
+  SearchableText=<dtml-sqlvar SearchableText type="string">,
+  EffectiveDate=<dtml-sqlvar EffectiveDate type="string">,
+  ExpiresDate=<dtml-sqlvar ExpiresDate type="string">,
+  ModificationDate=<dtml-sqlvar ModificationDate type="string">,
+  Title=<dtml-sqlvar getTitle type="string">,
+  Type=<dtml-sqlvar Type type="string">,
+  bobobase_modification_time=<dtml-sqlvar bobobase_modification_time type="string">,
+  created=<dtml-sqlvar created type="string">,
+  effective=<dtml-sqlvar effective type="string">,
+  expires=<dtml-sqlvar expires type="string">,
+  getIcon=<dtml-sqlvar getIcon type="string">,
   id=<dtml-sqlvar id type="string">,
-  in_reply_to=<dtml-sqlvar in_reply_to  type="string">,
-  meta_type=<dtml-sqlvar meta_type  type="string">,
-  portal_type=<dtml-sqlvar getPortalType  type="string">,
-  modified=<dtml-sqlvar modified  type="string">,
+  in_reply_to=<dtml-sqlvar in_reply_to type="string">,
+  meta_type=<dtml-sqlvar meta_type type="string">,
+  portal_type=<dtml-sqlvar getPortalType type="string">,
+  modified=<dtml-sqlvar modified type="string">,
   review_state=<dtml-sqlvar review_state type="string">,
   opportunity_state=<dtml-sqlvar opportunity_state type="string">,
   default_source_reference=<dtml-sqlvar getDefaultSourceReference type="string">,
@@ -108,8 +114,15 @@ UPDATE catalog SET   uid=<dtml-sqlvar uid type="int">,
   event_state=<dtml-sqlvar event_state type="string">,
   invoice_state=<dtml-sqlvar invoice_state type="string">,
   order_id=<dtml-sqlvar getOrderId type="string">,
-  reference=<dtml-sqlvar getReference  type="string">,
-  source_reference=<dtml-sqlvar getSourceReference  type="string">,
-  destination_reference=<dtml-sqlvar getDestinationReference  type="string">,
-  summary=<dtml-sqlvar summary  type="string">
+  reference=<dtml-sqlvar getReference type="string">,
+  source_reference=<dtml-sqlvar getSourceReference type="string">,
+  destination_reference=<dtml-sqlvar getDestinationReference type="string">,
+  summary=<dtml-sqlvar summary type="string">,
+  string_index=<dtml-sqlvar getStringIndex type="string">,
+  int_index=<dtml-if getIntIndex><dtml-sqlvar getIntIndex type="int"><dtml-else>NULL</dtml-if>,
+  float_index=<dtml-if getFloatIndex><dtml-sqlvar getFloatIndex type="float"><dtml-else>NULL</dtml-if>,
+  string_index2=<dtml-sqlvar getStringIndex2 type="string">,
+  int_index2=<dtml-if getIntIndex2><dtml-sqlvar getIntIndex2 type="int"><dtml-else>NULL</dtml-if>,
+  float_index2=<dtml-if getFloatIndex2><dtml-sqlvar getFloatIndex2 type="float"><dtml-else>NULL</dtml-if>
+
 WHERE <dtml-sqltest uid op=eq type=int> ;