[Greater-commits] r3733 - in branches/3.0.0-usf/GREAT-ER-DB-trunk: . dagreater impl/postgresql
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Thu Jul 28 15:14:12 CEST 2011
Author: aheinecke
Date: 2011-07-28 15:14:11 +0200 (Thu, 28 Jul 2011)
New Revision: 3733
Modified:
branches/3.0.0-usf/GREAT-ER-DB-trunk/
branches/3.0.0-usf/GREAT-ER-DB-trunk/README
branches/3.0.0-usf/GREAT-ER-DB-trunk/dagreater/apispec.py
branches/3.0.0-usf/GREAT-ER-DB-trunk/impl/postgresql/dagreater_pg.h
branches/3.0.0-usf/GREAT-ER-DB-trunk/impl/postgresql/datypes_pg.h
branches/3.0.0-usf/GREAT-ER-DB-trunk/impl/postgresql/gdagreater_pg.pgc
Log:
Warning included manual conflict resolution
Merged revisions 150-151,158 via svnmerge from
svn+ssh://wald.intevation.org/greater/branches/GREAT-ER-DB/usf
........
r150 | frank | 2005-08-16 15:18:48 +0200 (Tue, 16 Aug 2005) | 19 lines
Update of USF GREAT-ER-DB Interface to HEAD branch progress
* dagreater/apispec.py: Added DBInsertFunctions for da_insert_disch
and da_insert_stretch
* impl/postgresql/gdagreater_pg.pgc: Code cleanup:
File covered a bunch of "unused" variables. Commented out where
possible, v_module references wrapped with pre-processor clauses.
(gda_insert_disch, gda_insert_stretch): Explicit host variables
in INSERT statements. The former implicit statement (e.g.
" VALUES (:h_stretch)") caused an
error 201: Too many parameters (returned by the server).
* impl/postgresql/dagreater_pg.pgc: Code cleanup:
File covered a bunch of "unused" variables. Commented out where
possible, v_module references wrapped with pre-processor clauses.
* README: Fixed option: --wrapper-with-debug-output
........
r151 | frank | 2005-08-16 15:19:00 +0200 (Tue, 16 Aug 2005) | 2 lines
Update of USF GREAT-ER-DB Interface to HEAD branch progress
........
r158 | nhueffme | 2006-04-12 13:49:45 +0200 (Wed, 12 Apr 2006) | 2 lines
changes from zinc project
........
Property changes on: branches/3.0.0-usf/GREAT-ER-DB-trunk
___________________________________________________________________
Name: svnmerge-integrated
- /branches/GREAT-ER-DB/usf:1-133,137-143,217
+ /branches/GREAT-ER-DB/usf:1-133,137-143,150-158,217
Modified: branches/3.0.0-usf/GREAT-ER-DB-trunk/README
===================================================================
--- branches/3.0.0-usf/GREAT-ER-DB-trunk/README 2011-07-28 10:32:03 UTC (rev 3732)
+++ branches/3.0.0-usf/GREAT-ER-DB-trunk/README 2011-07-28 13:14:11 UTC (rev 3733)
@@ -17,7 +17,7 @@
--postgres-lib-path and --postgres-incl-path.
Additional Options:
- --wrapper_with_debug_output
+ --wrapper-with-debug-output
Usage
-----
Modified: branches/3.0.0-usf/GREAT-ER-DB-trunk/dagreater/apispec.py
===================================================================
--- branches/3.0.0-usf/GREAT-ER-DB-trunk/dagreater/apispec.py 2011-07-28 10:32:03 UTC (rev 3732)
+++ branches/3.0.0-usf/GREAT-ER-DB-trunk/dagreater/apispec.py 2011-07-28 13:14:11 UTC (rev 3733)
@@ -172,6 +172,8 @@
('disch_class_id', 'long'),
('name', Array('char', 256)),
('pop', Array('char', 41)),
+ ('roof', Array('char', 41)),
+ ('street', Array('char', 41)),
('dwf', Array('char', 41)),
('flow_val', Array('char', 256)),
('flow_dist', Array('char', 12)),
@@ -609,6 +611,8 @@
('status', Array('char', 31)),
('privs', 'int'),
('consumption', Array('char', 41)),
+ ('roof_runoff', Array('char', 41)),
+ ('street_runoff', Array('char', 41)),
('flux_nondom', Array('char', 41)),
('flux_runoff', Array('char', 41)),
('remark', Array('char', 2001)),
@@ -652,6 +656,8 @@
('status', Array('char', 31)),
('privs', 'int'),
('pop', Array('char', 41)),
+ ('roof', Array('char', 41)),
+ ('street', Array('char', 41)),
('dwf', Array('char', 41)),
('flow_val', Array('char', 256)),
('flow_dist', Array('char', 12)),
Modified: branches/3.0.0-usf/GREAT-ER-DB-trunk/impl/postgresql/dagreater_pg.h
===================================================================
--- branches/3.0.0-usf/GREAT-ER-DB-trunk/impl/postgresql/dagreater_pg.h 2011-07-28 10:32:03 UTC (rev 3732)
+++ branches/3.0.0-usf/GREAT-ER-DB-trunk/impl/postgresql/dagreater_pg.h 2011-07-28 13:14:11 UTC (rev 3733)
@@ -614,6 +614,8 @@
long disch_class_id;
char name [256];
char pop [ 41];
+ char roof [ 41];
+ char street [ 41];
char dwf [ 41];
char flow_val [256];
char flow_dist [ 12];
@@ -634,6 +636,8 @@
short int disch_class_id;
short int name;
short int pop;
+ short int roof;
+ short int street;
short int dwf;
short int flow_val;
short int flow_dist;
@@ -1035,6 +1039,8 @@
char status [ 31];
int privs;
char consumption[ 41];
+ char roof_runoff[ 41];
+ char street_runoff[41];
char flux_nondom[ 41];
char flux_runoff[ 41];
char remark[2001];
@@ -1053,6 +1059,8 @@
short int status;
short int privs;
short int consumption;
+ short int roof_runoff;
+ short int street_runoff;
short int flux_nondom;
short int flux_runoff;
short int remark;
@@ -1363,6 +1371,8 @@
char status [ 31];
int privs;
char pop [ 41];
+ char roof [ 41];
+ char street [ 41];
char dwf [ 41];
char flow_val [256];
char flow_dist [ 12];
@@ -1389,6 +1399,8 @@
short int status;
short int privs;
short int pop;
+ short int roof;
+ short int street;
short int dwf;
short int flow_val;
short int flow_dist;
@@ -1408,3 +1420,4 @@
*/
int errln; /* line number of current SQL-statement in
* current function/procdure */
+
Modified: branches/3.0.0-usf/GREAT-ER-DB-trunk/impl/postgresql/datypes_pg.h
===================================================================
--- branches/3.0.0-usf/GREAT-ER-DB-trunk/impl/postgresql/datypes_pg.h 2011-07-28 10:32:03 UTC (rev 3732)
+++ branches/3.0.0-usf/GREAT-ER-DB-trunk/impl/postgresql/datypes_pg.h 2011-07-28 13:14:11 UTC (rev 3733)
@@ -207,6 +207,8 @@
long disch_class_id; /* ID of linked disch class*/
char name [256]; /* disch data */
char pop [ 41];
+ char roof [ 41];
+ char street [ 41];
char dwf [ 41];
char flow_val [256];
char flow_dist [ 12];
@@ -463,6 +465,8 @@
char status [ 31];
int privs;
char consumption[ 41];
+ char roof_runoff[ 41];
+ char street_runoff[41];
char flux_nondom[ 41];
char flux_runoff[ 41];
char remark[2001];
@@ -683,6 +687,8 @@
char status [ 31];
int privs;
char pop [ 41];
+ char roof [ 41];
+ char street [ 41];
char dwf [ 41];
char flow_val [ 256];
char flow_dist [ 12];
@@ -710,3 +716,4 @@
#endif
+
Modified: branches/3.0.0-usf/GREAT-ER-DB-trunk/impl/postgresql/gdagreater_pg.pgc
===================================================================
--- branches/3.0.0-usf/GREAT-ER-DB-trunk/impl/postgresql/gdagreater_pg.pgc 2011-07-28 10:32:03 UTC (rev 3732)
+++ branches/3.0.0-usf/GREAT-ER-DB-trunk/impl/postgresql/gdagreater_pg.pgc 2011-07-28 13:14:11 UTC (rev 3733)
@@ -6177,25 +6177,43 @@
/* Insert passed record */
errln = 60;
- EXEC SQL INSERT INTO STRETCH_TAB ( STRETCH_ID,
- CATCH_ID,
- STRETCH_CLASS_ID,
- UP1_ID,
- UP2_ID,
- DOWN1_ID,
- DOWN2_ID,
- NAME,
- TYPE,
- Q_VAL,
- Q_DIST,
- V_VAL,
- V_DIST,
- L,
- D_VAL,
- D_DIST,
- VOL_VAL,
- VOL_DIST )
- VALUES (:h_stretch );
+ EXEC SQL INSERT INTO STRETCH_TAB ( STRETCH_ID,
+ CATCH_ID,
+ STRETCH_CLASS_ID,
+ UP1_ID,
+ UP2_ID,
+ DOWN1_ID,
+ DOWN2_ID,
+ NAME,
+ TYPE,
+ Q_VAL,
+ Q_DIST,
+ V_VAL,
+ V_DIST,
+ L,
+ D_VAL,
+ D_DIST,
+ VOL_VAL,
+ VOL_DIST )
+ VALUES (:h_stretch.stretch_id,
+ :h_stretch.catch_id,
+ :h_stretch.stretch_class_id,
+ :h_stretch.up1_id,
+ :h_stretch.up2_id,
+ :h_stretch.down1_id,
+ :h_stretch.down2_id,
+ :h_stretch.name,
+ :h_stretch.type,
+ :h_stretch.q_val,
+ :h_stretch.q_dist,
+ :h_stretch.v_val,
+ :h_stretch.v_dist,
+ :h_stretch.l,
+ :h_stretch.d_val,
+ :h_stretch.d_dist,
+ :h_stretch.vol_val,
+ :h_stretch.vol_dist
+ );
/* Update MOD_DATE in master (CATCH_TAB) */
h_catch_id_qry = vp_stretch->catch_id;
@@ -7007,7 +7025,7 @@
\return DA_SUCCESS \n DA_FAIL
*/
-int gda_get_disch (DB_con *db_con,
+int gda_get_disch (DB_con *db_con,
long vp_catch_id,
long vp_stretch_id,
long vp_disch_id,
@@ -7040,6 +7058,8 @@
long disch_class_id;
char name [256];
char pop [ 41];
+ char roof [ 41];
+ char street [ 41];
char dwf [ 41];
char flow_val [256];
char flow_dist [ 12];
@@ -7058,6 +7078,8 @@
short int disch_class_id;
short int name;
short int pop;
+ short int roof;
+ short int street;
short int dwf;
short int flow_val;
short int flow_dist;
@@ -7128,6 +7150,8 @@
"DISCH_CLASS_ID, "
"NAME,"
"POP,"
+ "ROOF,"
+ "STREET,"
"DWF,"
"FLOW_VAL,"
"FLOW_DIST,"
@@ -7165,6 +7189,8 @@
if (h_ind_disch.name == -1) strcpy(h_disch.name, "");
if (h_ind_disch.pop == -1) strcpy(h_disch.pop, "");
+ if (h_ind_disch.roof == -1) strcpy(h_disch.roof, "");
+ if (h_ind_disch.street == -1) strcpy(h_disch.street, "");
if (h_ind_disch.dwf == -1) strcpy(h_disch.dwf, "");
if (h_ind_disch.flow_val == -1) strcpy(h_disch.flow_val, "");
if (h_ind_disch.flow_dist == -1) strcpy(h_disch.flow_dist, "");
@@ -7183,6 +7209,8 @@
strcpy(v_disch_buf.name , h_disch.name);
strcpy(v_disch_buf.pop , h_disch.pop);
+ strcpy(v_disch_buf.roof , h_disch.roof);
+ strcpy(v_disch_buf.street , h_disch.street);
strcpy(v_disch_buf.dwf , h_disch.dwf);
strcpy(v_disch_buf.flow_val , h_disch.flow_val);
strcpy(v_disch_buf.flow_dist , h_disch.flow_dist);
@@ -7415,6 +7443,8 @@
long disch_class_id;
char name [256];
char pop [ 41];
+ char roof [ 41];
+ char street [ 41];
char dwf [ 41];
char flow_val [256];
char flow_dist [ 12];
@@ -7482,7 +7512,9 @@
h_disch.catch_id = vp_disch->catch_id;
h_disch.disch_class_id = vp_disch->disch_class_id;
strcpy(h_disch.name , vp_disch->name);
- strcpy(h_disch.pop , vp_disch->pop);
+ strcpy(h_disch.pop , vp_disch->pop);
+ strcpy(h_disch.roof , vp_disch->roof);
+ strcpy(h_disch.street , vp_disch->street);
strcpy(h_disch.dwf , vp_disch->dwf);
strcpy(h_disch.flow_val , vp_disch->flow_val);
strcpy(h_disch.flow_dist , vp_disch->flow_dist);
@@ -7499,38 +7531,39 @@
/* Insert passed record */
errln = 60;
- EXEC SQL INSERT INTO DISCH_TAB (
- DISCH_ID,
- STRETCH_ID,
- CATCH_ID,
- DISCH_CLASS_ID,
- NAME,
- POP,
- DWF,
- FLOW_VAL,
- FLOW_DIST,
- FLOW_DOM,
- FLOW_NONDOM,
- FLOW_RUNOFF,
- TREATED,
- R_WWTP,
- REMARK )
- VALUES (:h_disch.disch_id,
- :h_disch.stretch_id,
- :h_disch.catch_id,
- :h_disch.disch_class_id,
- :h_disch.name,
- :h_disch.pop,
- :h_disch.dwf,
- :h_disch.flow_val,
- :h_disch.flow_dist,
- :h_disch.flow_dom,
- :h_disch.flow_nondom,
- :h_disch.flow_runoff,
- :h_disch.treated,
- :h_disch.r_wwtp,
- :h_disch.remark
- );
+ EXEC SQL INSERT INTO DISCH_TAB ( DISCH_ID,
+ STRETCH_ID,
+ CATCH_ID,
+ DISCH_CLASS_ID,
+ NAME,
+ POP,
+ ROOF,
+ STREET,
+ DWF,
+ FLOW_VAL,
+ FLOW_DIST,
+ FLOW_DOM,
+ FLOW_NONDOM,
+ FLOW_RUNOFF,
+ TREATED,
+ R_WWTP,
+ REMARK )
+ VALUES (:h_disch.disch_id,
+ :h_disch.stretch_id,
+ :h_disch.catch_id,
+ :h_disch.disch_class_id,
+ :h_disch.name,
+ :h_disch.pop,
+ :h_disch.dwf,
+ :h_disch.flow_val,
+ :h_disch.flow_dist,
+ :h_disch.flow_dom,
+ :h_disch.flow_nondom,
+ :h_disch.flow_runoff,
+ :h_disch.treated,
+ :h_disch.r_wwtp,
+ :h_disch.remark
+ );
/* Update MOD_DATE in master (CATCH_TAB) */
h_catch_id_qry = vp_disch->catch_id;
@@ -7625,6 +7658,8 @@
long disch_class_id;
char name [256];
char pop [ 41];
+ char roof [ 41];
+ char street [ 41];
char dwf [ 41];
char flow_val [256];
char flow_dist [ 12];
@@ -7681,6 +7716,8 @@
h_catch_id_qry = vp_catch_id;
strcpy (h_disch.name , vp_disch.name);
strcpy (h_disch.pop , vp_disch.pop);
+ strcpy (h_disch.roof , vp_disch.roof);
+ strcpy (h_disch.street , vp_disch.street);
strcpy (h_disch.dwf , vp_disch.dwf);
strcpy (h_disch.flow_val , vp_disch.flow_val);
strcpy (h_disch.flow_dist , vp_disch.flow_dist);
@@ -7702,6 +7739,8 @@
DISCH_CLASS_ID = :h_disch.disch_class_id,
NAME = :h_disch.name,
POP = :h_disch.pop,
+ ROOF = :h_disch.roof,
+ STREET = :h_disch.street,
DWF = :h_disch.dwf,
FLOW_VAL = :h_disch.flow_val,
FLOW_DIST = :h_disch.flow_dist,
@@ -7803,6 +7842,8 @@
long disch_class_id;
char name [256];
char pop [ 41];
+ char roof [ 41];
+ char street [ 41];
char dwf [ 41];
char flow_val [256];
char flow_dist [ 12];
@@ -8554,7 +8595,7 @@
\return DA_SUCCESS \n DA_FAIL
*/
-int gda_insert_backgrd (DB_con *db_con, DA_T_backgrd vp_backgrd,
+int gda_insert_backgrd (DB_con *db_con, DA_T_backgrd vp_backgrd,
DA_T_errinfo *vp_errinfo)
{
DA_T_MODULE_NAME v_module = "gda_insert_backgrd";
@@ -13266,13 +13307,13 @@
EXEC SQL INSERT INTO MARKET_TAB ( MARKET_ID, DISCH_ID, CATCH_ID, NAME,
USER_ID, PRIVS, STATUS,
CRE_DATE, MOD_DATE,
- CONSUMPTION, FLUX_NONDOM, FLUX_RUNOFF,
- REMARK )
+ CONSUMPTION, ROOF_RUNOFF, STREET_RUNOFF,
+ FLUX_NONDOM, FLUX_RUNOFF, REMARK )
SELECT :h_market_id_new, DISCH_ID, CATCH_ID, NAME,
:h_temp_user_id, PRIVS, STATUS,
CRE_DATE, to_timestamp(:h_sess.mod_date,:h_fmt_date),
- CONSUMPTION, FLUX_NONDOM, FLUX_RUNOFF,
- REMARK
+ CONSUMPTION, ROOF_RUNOFF, STREET_RUNOFF,
+ FLUX_NONDOM, FLUX_RUNOFF, REMARK
FROM MARKET_TAB
WHERE MARKET_ID = :h_sess.market_id
AND CATCH_ID = :h_sess.catch_id;
@@ -13366,18 +13407,18 @@
CATCH_ID, DISCH_CLASS_ID, NAME,
USER_ID, PRIVS, STATUS,
CRE_DATE, MOD_DATE,
- POP, DWF, FLOW_VAL,
- FLOW_DIST, FLOW_DOM, FLOW_NONDOM,
- FLOW_RUNOFF, TREATED, R_WWTP,
- REMARK )
+ POP, ROOF, STREET,
+ DWF, FLOW_VAL, FLOW_DIST,
+ FLOW_DOM, FLOW_NONDOM, FLOW_RUNOFF,
+ TREATED, R_WWTP, REMARK )
SELECT :h_sess_disch_id_new, DISCH_ID, STRETCH_ID,
CATCH_ID, DISCH_CLASS_ID, NAME,
:h_temp_user_id, PRIVS, STATUS,
CRE_DATE, to_timestamp(:h_sess.mod_date,:h_fmt_date),
- POP, DWF, FLOW_VAL,
- FLOW_DIST, FLOW_DOM, FLOW_NONDOM,
- FLOW_RUNOFF, TREATED, R_WWTP,
- REMARK
+ POP, ROOF, STREET,
+ DWF, FLOW_VAL, FLOW_DIST,
+ FLOW_DOM, FLOW_NONDOM, FLOW_RUNOFF,
+ TREATED, R_WWTP, REMARK
FROM SESS_DISCH_TAB
WHERE SESS_DISCH_ID = :h_sess.sess_disch_id
AND CATCH_ID = :h_sess.catch_id;
@@ -14101,6 +14142,8 @@
char status [ 31];
int privs;
char pop [ 41];
+ char roof [ 41];
+ char street [ 41];
char dwf [ 41];
char flow_val [256];
char flow_dist [ 12];
@@ -14125,6 +14168,8 @@
short int status;
short int privs;
short int pop;
+ short int roof;
+ short int street;
short int dwf;
short int flow_val;
short int flow_dist;
@@ -14206,6 +14251,8 @@
"STATUS,"
"PRIVS,"
"POP,"
+ "ROOF,"
+ "STREET,"
"DWF,"
"FLOW_VAL,"
"FLOW_DIST,"
@@ -14249,6 +14296,8 @@
if (h_ind_sess_disch.mod_date == -1) strcpy(h_sess_disch.mod_date, "");
if (h_ind_sess_disch.status == -1) strcpy(h_sess_disch.status, "");
if (h_ind_sess_disch.pop == -1) strcpy(h_sess_disch.pop, "");
+ if (h_ind_sess_disch.roof == -1) strcpy(h_sess_disch.roof, "");
+ if (h_ind_sess_disch.street == -1) strcpy(h_sess_disch.street, "");
if (h_ind_sess_disch.dwf == -1) strcpy(h_sess_disch.dwf, "");
if (h_ind_sess_disch.flow_val == -1) strcpy(h_sess_disch.flow_val, "");
if (h_ind_sess_disch.flow_dist == -1) strcpy(h_sess_disch.flow_dist, "");
@@ -14272,6 +14321,8 @@
strcpy(v_sess_disch_buf.mod_date , h_sess_disch.mod_date);
strcpy(v_sess_disch_buf.status , h_sess_disch.status);
strcpy(v_sess_disch_buf.pop , h_sess_disch.pop);
+ strcpy(v_sess_disch_buf.roof , h_sess_disch.roof);
+ strcpy(v_sess_disch_buf.street , h_sess_disch.street);
strcpy(v_sess_disch_buf.dwf , h_sess_disch.dwf);
strcpy(v_sess_disch_buf.flow_val , h_sess_disch.flow_val);
strcpy(v_sess_disch_buf.flow_dist , h_sess_disch.flow_dist);
@@ -14444,6 +14495,8 @@
char status [ 31];
int privs;
char pop [ 41];
+ char roof [ 41];
+ char street [ 41];
char dwf [ 41];
char flow_val [256];
char flow_dist [ 12];
@@ -14542,6 +14595,8 @@
lda_strtoupper(h_sess_disch.user_id, vg_db_user_info.user_id);
strcpy(h_sess_disch.status , vp_sess_disch->status);
strcpy(h_sess_disch.pop , vp_sess_disch->pop);
+ strcpy(h_sess_disch.roof , vp_sess_disch->roof);
+ strcpy(h_sess_disch.street , vp_sess_disch->street);
strcpy(h_sess_disch.dwf , vp_sess_disch->dwf);
strcpy(h_sess_disch.flow_val , vp_sess_disch->flow_val);
strcpy(h_sess_disch.flow_dist , vp_sess_disch->flow_dist);
@@ -14566,6 +14621,8 @@
STATUS,
PRIVS,
POP,
+ ROOF,
+ STREET,
DWF,
FLOW_VAL,
FLOW_DIST,
@@ -14587,6 +14644,8 @@
:h_sess_disch.status,
:h_sess_disch.privs,
:h_sess_disch.pop,
+ :h_sess_disch.roof,
+ :h_sess_disch.street,
:h_sess_disch.dwf,
:h_sess_disch.flow_val,
:h_sess_disch.flow_dist,
@@ -14697,6 +14756,8 @@
char status [ 31];
int privs;
char pop [ 41];
+ char roof [ 41];
+ char street [ 41];
char dwf [ 41];
char flow_val [256];
char flow_dist [ 12];
@@ -14752,6 +14813,8 @@
strcpy(h_sess_disch.mod_date , vp_sess_disch->mod_date);
strcpy(h_sess_disch.status , vp_sess_disch->status);
strcpy(h_sess_disch.pop , vp_sess_disch->pop);
+ strcpy(h_sess_disch.roof , vp_sess_disch->roof);
+ strcpy(h_sess_disch.street , vp_sess_disch->street);
strcpy(h_sess_disch.dwf , vp_sess_disch->dwf);
strcpy(h_sess_disch.flow_val , vp_sess_disch->flow_val);
strcpy(h_sess_disch.flow_dist , vp_sess_disch->flow_dist);
@@ -14794,6 +14857,8 @@
STATUS = :h_sess_disch.status,
PRIVS = :h_sess_disch.privs,
POP = :h_sess_disch.pop,
+ ROOF = :h_sess_disch.roof,
+ STREET = :h_sess_disch.street,
DWF = :h_sess_disch.dwf,
FLOW_VAL = :h_sess_disch.flow_val,
FLOW_DIST = :h_sess_disch.flow_dist,
@@ -14909,6 +14974,8 @@
char status [ 31];
int privs;
char pop [ 41];
+ char roof [ 41];
+ char street [ 41];
char dwf [ 41];
char flow_val [256];
char flow_dist [ 12];
@@ -14935,6 +15002,8 @@
short int status;
short int privs;
short int pop;
+ short int roof;
+ short int street;
short int dwf;
short int flow_val;
short int flow_dist;
@@ -18891,6 +18960,8 @@
char status [ 31];
int privs;
char consumption[ 41];
+ char roof_runoff[ 41];
+ char street_runoff[41];
char flux_nondom[ 41];
char flux_runoff[ 41];
char remark[2001];
@@ -18907,6 +18978,8 @@
short int status;
short int privs;
short int consumption;
+ short int roof_runoff;
+ short int street_runoff;
short int flux_nondom;
short int flux_runoff;
short int remark;
@@ -18981,6 +19054,8 @@
"STATUS,"
"PRIVS,"
"CONSUMPTION,"
+ "ROOF_RUNOFF,"
+ "STREET_RUNOFF,"
"FLUX_NONDOM,"
"FLUX_RUNOFF,"
"REMARK "
@@ -19016,6 +19091,8 @@
if (h_ind_market.mod_date == -1) strcpy(h_market.mod_date, "");
if (h_ind_market.status == -1) strcpy(h_market.status, "");
if (h_ind_market.consumption== -1) strcpy(h_market.consumption, "");
+ if (h_ind_market.roof_runoff== -1) strcpy(h_market.roof_runoff, "");
+ if (h_ind_market.street_runoff==-1) strcpy(h_market.street_runoff,"");
if (h_ind_market.flux_nondom== -1) strcpy(h_market.flux_nondom, "");
if (h_ind_market.flux_runoff== -1) strcpy(h_market.flux_runoff, "");
if (h_ind_market.remark == -1) strcpy(h_market.remark, "");
@@ -19031,6 +19108,8 @@
strcpy(v_market_buf.mod_date , h_market.mod_date);
strcpy(v_market_buf.status , h_market.status);
strcpy(v_market_buf.consumption, h_market.consumption);
+ strcpy(v_market_buf.roof_runoff, h_market.roof_runoff);
+ strcpy(v_market_buf.street_runoff, h_market.street_runoff);
strcpy(v_market_buf.flux_nondom, h_market.flux_nondom);
strcpy(v_market_buf.flux_runoff, h_market.flux_runoff);
strcpy(v_market_buf.remark , h_market.remark);
@@ -19202,6 +19281,8 @@
char status [ 31];
int privs;
char consumption[ 41];
+ char roof_runoff[ 41];
+ char street_runoff[41];
char flux_nondom[ 41];
char flux_runoff[ 41];
char remark[2001];
@@ -19295,6 +19376,8 @@
lda_strtoupper(h_market.user_id, vg_db_user_info.user_id);
strcpy(h_market.status , vp_market->status);
strcpy(h_market.consumption, vp_market->consumption);
+ strcpy(h_market.roof_runoff, vp_market->roof_runoff);
+ strcpy(h_market.street_runoff, vp_market->street_runoff);
strcpy(h_market.flux_nondom, vp_market->flux_nondom);
strcpy(h_market.flux_runoff, vp_market->flux_runoff);
strcpy(h_market.remark , vp_market->remark);
@@ -19311,6 +19394,8 @@
STATUS,
PRIVS,
CONSUMPTION,
+ ROOF_RUNOFF,
+ STREET_RUNOFF,
FLUX_NONDOM,
FLUX_RUNOFF,
REMARK )
@@ -19324,6 +19409,8 @@
:h_market.status,
:h_market.privs,
:h_market.consumption,
+ :h_market.roof_runoff,
+ :h_market.street_runoff,
:h_market.flux_nondom,
:h_market.flux_runoff,
:h_market.remark);
@@ -19427,6 +19514,8 @@
char status [ 31];
int privs;
char consumption[ 41];
+ char roof_runoff[ 41];
+ char street_runoff[41];
char flux_nondom[ 41];
char flux_runoff[ 41];
char remark[2001];
@@ -19477,6 +19566,8 @@
strcpy(h_market.mod_date , vp_market->mod_date);
strcpy(h_market.status , vp_market->status);
strcpy(h_market.consumption, vp_market->consumption);
+ strcpy(h_market.roof_runoff, vp_market->roof_runoff);
+ strcpy(h_market.street_runoff, vp_market->street_runoff);
strcpy(h_market.flux_nondom, vp_market->flux_nondom);
strcpy(h_market.flux_runoff, vp_market->flux_runoff);
strcpy(h_market.remark , vp_market->remark);
@@ -19507,6 +19598,8 @@
STATUS = :h_market.status,
PRIVS = :h_market.privs,
CONSUMPTION = :h_market.consumption,
+ ROOF_RUNOFF = :h_market.roof_runoff,
+ STREET_RUNOFF = :h_market.street_runoff,
FLUX_NONDOM = :h_market.flux_nondom,
FLUX_RUNOFF = :h_market.flux_runoff,
REMARK = :h_market.remark
@@ -19612,6 +19705,8 @@
char status [ 31];
int privs;
char consumption[ 41];
+ char roof_runoff[ 41];
+ char street_runoff[41];
char flux_nondom[ 41];
char flux_runoff[ 41];
char remark[2001];
@@ -19628,6 +19723,8 @@
short int status;
short int privs;
short int consumption;
+ short int roof_runoff;
+ short int street_runoff;
short int flux_nondom;
short int flux_runoff;
short int remark;
@@ -27219,3 +27316,4 @@
return(DA_FAIL);
}
+
More information about the Greater-commits
mailing list