Changes made for bulk load and 'flange size' (MESC_CODE on meters).

Store images used by the WebServer git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3797 248e525c-4dfb-0310-94bc-949c084e9493
2008-02-29 17:27:39 +00:00
parent 6dbf407063
commit 5649f4b934
25 changed files with 16249 additions and 15839 deletions
--- a/Schema/InstallAssociateSchema.sql
+++ b/Schema/InstallAssociateSchema.sql
@@ -0,0 +1,5 @@
+connect &1/&2@&5 as sysdba
+
+@@AssociateSchema.sql &3 &6
+
+exit
--- a/Schema/InstallMIP.sql
+++ b/Schema/InstallMIP.sql
@@ -24,7 +24,4 @@ connect &3/&4@&5
@@mipViews.sql
@@mipLibraries.sql

-connect &1/&2@&5 as sysdba
-@@AssociateSchema.sql &3 &6
-
 exit
--- a/Schema/ext_meter.pdc
+++ b/Schema/ext_meter.pdc
@@ -21,7 +21,8 @@ create table ext_meters
  valid_from varchar2(240),
  valid_to varchar2(240),
  qnom varchar2(240),
-  qmin varchar2(240)
+  qmin varchar2(240),
+  mesc_code VARCHAR2(240)
   )  
   ORGANIZATION EXTERNAL
 ( type oracle_loader
@@ -31,7 +32,6 @@ access parameters
  READSIZE 10485760
  skip 1
  fields terminated by ',' 
-  optionally enclosed BY '"'
  missing field values are null
  (
  code,
@@ -47,7 +47,8 @@ access parameters
  valid_from,
  valid_to,
  qnom,
-  qmin
+  qmin,
+  mesc_code
  )
 )
 location ('METERS.csv')
--- a/Schema/ext_module.pdc
+++ b/Schema/ext_module.pdc
@@ -49,8 +49,6 @@ ACCESS PARAMETERS(
  10485760 skip 1
  fields
  terminated BY ','
-  optionally
-  enclosed BY '"'
  missing
  field
  VALUES are
--- a/Schema/mip.con
+++ b/Schema/mip.con
@@ -1,6 +1,6 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.con
 --
-- Generated for Oracle 10g on Thu Feb 28  15:14:04 2008 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Fri Feb 29  13:52:13 2008 by Server Generator 10.1.2.6.18
  
 PROMPT Creating Primary Key on 'SYSTEM_CONFIGURATION'
 ALTER TABLE SYSTEM_CONFIGURATION
@@ -511,12 +511,12 @@ ALTER TABLE REGI_ENQU_EXCLUSIONS
               
 PROMPT Creating Check Constraint on 'METER_SIZE_CODES'
 ALTER TABLE METER_SIZE_CODES
- ADD (CONSTRAINT AVCON_1204211644_VALID_000 CHECK (VALID_FOR_EXISTING_METER IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204293133_VALID_000 CHECK (VALID_FOR_EXISTING_METER IN ('YES', 'NO')))
 /

 PROMPT Creating Check Constraint on 'METER_SIZE_CODES'
 ALTER TABLE METER_SIZE_CODES
- ADD (CONSTRAINT AVCON_1204211644_VALID_001 CHECK (VALID_FOR_NEW_METER IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204293133_VALID_001 CHECK (VALID_FOR_NEW_METER IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'COSTS'
@@ -552,18 +552,18 @@ ALTER TABLE COSTS

 PROMPT Creating Check Constraint on 'COSTS'
 ALTER TABLE COSTS
- ADD (CONSTRAINT AVCON_1204211644_COST__000 CHECK (COST_TYPE 
+ ADD (CONSTRAINT AVCON_1204293133_COST__000 CHECK (COST_TYPE 
 IN ('LACO', 'BACO', 'MOCO', 'MECO', 'AICO', 'HOCO', 'COST')))
 /
 
 PROMPT Creating Check Constraint on 'DOCUMENTS'
 ALTER TABLE DOCUMENTS
- ADD (CONSTRAINT AVCON_1204211644_DOCU__000 CHECK (DOCU_TYPE IN ('DOCU', 'INDO', 'EXDO', 'FIDO')))
+ ADD (CONSTRAINT AVCON_1204293133_DOCU__000 CHECK (DOCU_TYPE IN ('DOCU', 'INDO', 'EXDO', 'FIDO')))
 /
       
 PROMPT Creating Check Constraint on 'QUOTES'
 ALTER TABLE QUOTES
- ADD (CONSTRAINT AVCON_1204211644_QUTE__000 CHECK (QUTE_TYPE IN ('AQ', 'MQ', 'QUTE')))
+ ADD (CONSTRAINT AVCON_1204293133_QUTE__000 CHECK (QUTE_TYPE IN ('AQ', 'MQ', 'QUTE')))
 /
 
 PROMPT Creating Check Constraint on 'PARTY_RELATIONSHIPS'
@@ -575,17 +575,17 @@ to_parl_rt_code = to_prtp_rt_code))
     
 PROMPT Creating Check Constraint on 'PARTIES'
 ALTER TABLE PARTIES
- ADD (CONSTRAINT AVCON_1204211644_TRIPA_000 CHECK (TRIPARTITE_MEMBER IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204293133_TRIPA_000 CHECK (TRIPARTITE_MEMBER IN ('YES', 'NO')))
 /

 PROMPT Creating Check Constraint on 'PARTIES'
 ALTER TABLE PARTIES
- ADD (CONSTRAINT AVCON_1204211644_STATU_000 CHECK (STATUS IN ('OPEN', 'EXPIRED', 'LOCKED')))
+ ADD (CONSTRAINT AVCON_1204293133_STATU_000 CHECK (STATUS IN ('OPEN', 'EXPIRED', 'LOCKED')))
 /

 PROMPT Creating Check Constraint on 'PARTIES'
 ALTER TABLE PARTIES
- ADD (CONSTRAINT AVCON_1204211644_PRTY__000 CHECK (PRTY_TYPE 
+ ADD (CONSTRAINT AVCON_1204293133_PRTY__000 CHECK (PRTY_TYPE 
 IN ('PRTY', 'IO', 'EO', 'MKTP', 'PERS', 'MANU', 'NEMP', 'EMP', 'ORG'
 )))
 /
@@ -603,82 +603,82 @@ OR

 PROMPT Creating Check Constraint on 'DOCUMENT_ROLES'
 ALTER TABLE DOCUMENT_ROLES
- ADD (CONSTRAINT AVCON_1204211644_DORO__000 CHECK (DORO_TYPE IN ('DRRO', 'DORO', 'ENDO', 'QUDO')))
+ ADD (CONSTRAINT AVCON_1204293133_DORO__000 CHECK (DORO_TYPE IN ('DRRO', 'DORO', 'ENDO', 'QUDO')))
 /
 
 PROMPT Creating Check Constraint on 'QUOTE_ITEMS'
 ALTER TABLE QUOTE_ITEMS
- ADD (CONSTRAINT AVCON_1204211644_QUIT__000 CHECK (QUIT_TYPE IN ('LQI', 'AQI', 'BQI', 'MQI', 'QUIT', 'HQI')))
+ ADD (CONSTRAINT AVCON_1204293133_QUIT__000 CHECK (QUIT_TYPE IN ('LQI', 'AQI', 'BQI', 'MQI', 'QUIT', 'HQI')))
 /
 
 PROMPT Creating Check Constraint on 'ROLE_TYPES'
 ALTER TABLE ROLE_TYPES
- ADD (CONSTRAINT AVCON_1204211644_RT_TY_000 CHECK (RT_TYPE IN ('DORT', 'PART', 'RT', 'PCMRT', 'QURT', 'ENRT', 'PRT')))
+ ADD (CONSTRAINT AVCON_1204293133_RT_TY_000 CHECK (RT_TYPE IN ('DORT', 'PART', 'RT', 'PCMRT', 'QURT', 'ENRT', 'PRT')))
 /
            
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204211644_DOWNS_000 CHECK (DOWNSTREAM_BOOSTER_OR_COMPRESS IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204293133_DOWNS_000 CHECK (DOWNSTREAM_BOOSTER_OR_COMPRESS IN ('YES', 'NO')))
 /

 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204211644_INDIC_000 CHECK (INDICATIVE_TIME IN ('DY', 'AM', 'PM')))
+ ADD (CONSTRAINT AVCON_1204293133_INDIC_000 CHECK (INDICATIVE_TIME IN ('DY', 'AM', 'PM')))
 /

 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204211644_HOUSI_000 CHECK (HOUSING_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204293133_HOUSI_000 CHECK (HOUSING_REQUIRED IN ('YES', 'NO')))
 /

 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204211644_BASE__000 CHECK (BASE_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204293133_BASE__000 CHECK (BASE_REQUIRED IN ('YES', 'NO')))
 /

 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204211644_CONVE_000 CHECK (CONVERTOR_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204293133_CONVE_000 CHECK (CONVERTOR_REQUIRED IN ('YES', 'NO')))
 /

 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204211644_AMR_R_000 CHECK (AMR_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204293133_AMR_R_000 CHECK (AMR_REQUIRED IN ('YES', 'NO')))
 /

 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204211644_EMS_R_000 CHECK (EMS_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204293133_EMS_R_000 CHECK (EMS_REQUIRED IN ('YES', 'NO')))
 /

 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204211644_TWIN__000 CHECK (TWIN_STREAM_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204293133_TWIN__000 CHECK (TWIN_STREAM_REQUIRED IN ('YES', 'NO')))
 /

 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204211644_EXIST_000 CHECK (EXISTING_LOGGER IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204293133_EXIST_000 CHECK (EXISTING_LOGGER IN ('YES', 'NO')))
 /

 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204211644_LOAD__000 CHECK (LOAD_CONTROL_TYPE IN ('Constant', 'On/Off', 'Modulating')))
+ ADD (CONSTRAINT AVCON_1204293133_LOAD__000 CHECK (LOAD_CONTROL_TYPE IN ('Constant', 'On/Off', 'Modulating')))
 /

 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204211644_EXIST_001 CHECK (EXISTING_METER_OWNER IN ('S', 'T', 'C')))
+ ADD (CONSTRAINT AVCON_1204293133_EXIST_001 CHECK (EXISTING_METER_OWNER IN ('S', 'T', 'C')))
 /

 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204211644_EXIST_002 CHECK (EXISTING_CONVERTOR IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204293133_EXIST_002 CHECK (EXISTING_CONVERTOR IN ('YES', 'NO')))
 /

 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204211644_MARKE_000 CHECK (MARKET_SECTOR_CODE IN ('I', 'D')))
+ ADD (CONSTRAINT AVCON_1204293133_MARKE_000 CHECK (MARKET_SECTOR_CODE IN ('I', 'D')))
 /
          
 PROMPT Creating Check Constraint on 'REGI_ENQU_EXCLUSIONS'
@@ -1150,6 +1150,13 @@ ALTER TABLE METERS ADD (CONSTRAINT
  (CODE))
 /

+PROMPT Creating Foreign Key on 'METERS'
+ALTER TABLE METERS ADD (CONSTRAINT
+ METR_MESC_FK FOREIGN KEY 
+  (MESC_CODE) REFERENCES METER_SIZE_CODES
+  (CODE))
+/
+
 PROMPT Creating Foreign Key on 'METERS'
 ALTER TABLE METERS ADD (CONSTRAINT
 METR_METY_FK FOREIGN KEY 
--- a/Schema/mip.ind
+++ b/Schema/mip.ind
@@ -1,6 +1,6 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.ind
 --
-- Generated for Oracle 10g on Thu Feb 28  15:14:04 2008 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Fri Feb 29  13:52:13 2008 by Server Generator 10.1.2.6.18
  

 PROMPT Creating Index 'REGU_RETY_FK_I'
@@ -344,6 +344,11 @@ CREATE INDEX LETI_SVCPT_FK_I ON LEAD_TIMES
 (SVCPT_CODE)
 /

+PROMPT Creating Index 'METR_MESC_FK_I'
+CREATE INDEX METR_MESC_FK_I ON METERS
+ (MESC_CODE)
+/
+
 PROMPT Creating Index 'METR_METY_FK_I'
 CREATE INDEX METR_METY_FK_I ON METERS
 (METY_CODE)
--- a/Schema/mip.sql
+++ b/Schema/mip.sql
@@ -1,6 +1,6 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.sql
 --
-- Generated for Oracle 10g on Thu Feb 28  15:14:05 2008 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Fri Feb 29  13:52:14 2008 by Server Generator 10.1.2.6.18


 SPOOL mip.lst
--- a/Schema/mip.sqs
+++ b/Schema/mip.sqs
@@ -1,6 +1,6 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.sqs
 --
-- Generated for Oracle 10g on Thu Feb 28  15:14:04 2008 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Fri Feb 29  13:52:13 2008 by Server Generator 10.1.2.6.18
 
 PROMPT Creating Sequence 'FLTR_SEQ'
 CREATE SEQUENCE FLTR_SEQ
--- a/Schema/mip.tab
+++ b/Schema/mip.tab
@@ -1,6 +1,6 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.tab
 --
-- Generated for Oracle 10g on Thu Feb 28  15:14:04 2008 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Fri Feb 29  13:52:13 2008 by Server Generator 10.1.2.6.18
 


@@ -442,17 +442,18 @@ CREATE TABLE LEAD_TIMES
 PROMPT Creating Table 'METERS'
 CREATE TABLE METERS
 (CODE VARCHAR2(80) NOT NULL
+ ,MESC_CODE VARCHAR2(80) NOT NULL
 ,METY_CODE VARCHAR2(80) NOT NULL
 ,PRTY_ID NUMBER NOT NULL
- ,QMAX NUMBER NOT NULL
 ,DRWG_CODE VARCHAR2(80)
 ,DIM_A NUMBER
 ,DIM_B NUMBER
 ,DIM_C NUMBER
 ,CENTRES NUMBER
 ,WEIGHT NUMBER
- ,QMIN NUMBER NOT NULL
- ,QNOM NUMBER NOT NULL
+ ,QMAX NUMBER
+ ,QMIN NUMBER
+ ,QNOM NUMBER
 ,VALID_FROM DATE NOT NULL
 ,VALID_TO DATE
 )
@@ -609,7 +610,7 @@ CREATE TABLE ENQUIRIES
 ,QMAX NUMBER
 ,QMIN NUMBER
 ,LOAD_CONTROL_TYPE VARCHAR2(10)
- ,EXISTING_METER_SERIAL_NO VARCHAR2(14)
+ ,EXISTING_METER_SERIAL_NO VARCHAR2(30)
 ,EXISTING_METER_MODEL VARCHAR2(10)
 ,EXISTING_METER_OWNER VARCHAR2(1)
 ,EXISTING_METER_ASSET_PROVIDER VARCHAR2(210)