[Greater-commits] r3734 - 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:45:37 CEST 2011
Author: aheinecke
Date: 2011-07-28 15:45:36 +0200 (Thu, 28 Jul 2011)
New Revision: 3734
Modified:
branches/3.0.0-usf/GREAT-ER-DB-trunk/
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:
Merged revisions 163 via svnmerge from
svn+ssh://wald.intevation.org/greater/branches/GREAT-ER-DB/usf
........
r163 | nhueffme | 2009-01-16 10:54:29 +0100 (Fri, 16 Jan 2009) | 2 lines
For the new emission mode 2, the WWTP parameters were extended by the parameter paved_surface and the substance's parameters by 'DEFAULT_SURFACEPOTENTIAL'.
........
Property changes on: branches/3.0.0-usf/GREAT-ER-DB-trunk
___________________________________________________________________
Name: svnmerge-integrated
- /branches/GREAT-ER-DB/usf:1-133,137-143,150-158,217
+ /branches/GREAT-ER-DB/usf:1-133,137-143,150-158,163,217
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 13:14:11 UTC (rev 3733)
+++ branches/3.0.0-usf/GREAT-ER-DB-trunk/dagreater/apispec.py 2011-07-28 13:45:36 UTC (rev 3734)
@@ -172,6 +172,7 @@
('disch_class_id', 'long'),
('name', Array('char', 256)),
('pop', Array('char', 41)),
+ ('paved_surface', Array('char', 41)),
('roof', Array('char', 41)),
('street', Array('char', 41)),
('dwf', Array('char', 41)),
@@ -615,6 +616,7 @@
('street_runoff', Array('char', 41)),
('flux_nondom', Array('char', 41)),
('flux_runoff', Array('char', 41)),
+ ('wwtp_removal', Array('char', 41)),
('remark', Array('char', 2001)),
('next_element', Pointer('DA_S_market'))])
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 13:14:11 UTC (rev 3733)
+++ branches/3.0.0-usf/GREAT-ER-DB-trunk/impl/postgresql/dagreater_pg.h 2011-07-28 13:45:36 UTC (rev 3734)
@@ -614,6 +614,7 @@
long disch_class_id;
char name [256];
char pop [ 41];
+ char paved_surface[41];
char roof [ 41];
char street [ 41];
char dwf [ 41];
@@ -1043,6 +1044,7 @@
char street_runoff[41];
char flux_nondom[ 41];
char flux_runoff[ 41];
+ char wwtp_removal[41];
char remark[2001];
} DA_T_market_pg_h;
@@ -1063,6 +1065,7 @@
short int street_runoff;
short int flux_nondom;
short int flux_runoff;
+ short int wwtp_removal;
short int remark;
} DA_T_market_pg_i;
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 13:14:11 UTC (rev 3733)
+++ branches/3.0.0-usf/GREAT-ER-DB-trunk/impl/postgresql/datypes_pg.h 2011-07-28 13:45:36 UTC (rev 3734)
@@ -207,6 +207,7 @@
long disch_class_id; /* ID of linked disch class*/
char name [256]; /* disch data */
char pop [ 41];
+ char paved_surface[41];
char roof [ 41];
char street [ 41];
char dwf [ 41];
@@ -468,7 +469,8 @@
char roof_runoff[ 41];
char street_runoff[41];
char flux_nondom[ 41];
- char flux_runoff[ 41];
+ char flux_runoff[ 41];
+ char wwtp_removal[41];
char remark[2001];
struct DA_S_market *next_element;
} DA_T_market;
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 13:14:11 UTC (rev 3733)
+++ branches/3.0.0-usf/GREAT-ER-DB-trunk/impl/postgresql/gdagreater_pg.pgc 2011-07-28 13:45:36 UTC (rev 3734)
@@ -7058,6 +7058,7 @@
long disch_class_id;
char name [256];
char pop [ 41];
+ char paved_surface[41];
char roof [ 41];
char street [ 41];
char dwf [ 41];
@@ -7078,6 +7079,7 @@
short int disch_class_id;
short int name;
short int pop;
+ short int paved_surface;
short int roof;
short int street;
short int dwf;
@@ -7150,6 +7152,7 @@
"DISCH_CLASS_ID, "
"NAME,"
"POP,"
+ "PAVED_SURFACE,"
"ROOF,"
"STREET,"
"DWF,"
@@ -7189,6 +7192,7 @@
if (h_ind_disch.name == -1) strcpy(h_disch.name, "");
if (h_ind_disch.pop == -1) strcpy(h_disch.pop, "");
+ if (h_ind_disch.paved_surface == -1) strcpy(h_disch.paved_surface, "");
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, "");
@@ -7209,6 +7213,7 @@
strcpy(v_disch_buf.name , h_disch.name);
strcpy(v_disch_buf.pop , h_disch.pop);
+ strcpy(v_disch_buf.paved_surface , h_disch.paved_surface);
strcpy(v_disch_buf.roof , h_disch.roof);
strcpy(v_disch_buf.street , h_disch.street);
strcpy(v_disch_buf.dwf , h_disch.dwf);
@@ -7443,6 +7448,7 @@
long disch_class_id;
char name [256];
char pop [ 41];
+ char paved_surface[41];
char roof [ 41];
char street [ 41];
char dwf [ 41];
@@ -7513,6 +7519,7 @@
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.paved_surface , vp_disch->paved_surface);
strcpy(h_disch.roof , vp_disch->roof);
strcpy(h_disch.street , vp_disch->street);
strcpy(h_disch.dwf , vp_disch->dwf);
@@ -7537,6 +7544,7 @@
DISCH_CLASS_ID,
NAME,
POP,
+ PAVED_SURFACE,
ROOF,
STREET,
DWF,
@@ -7553,7 +7561,10 @@
:h_disch.catch_id,
:h_disch.disch_class_id,
:h_disch.name,
- :h_disch.pop,
+ :h_disch.pop,
+ :h_disch.paved_surface,
+ :h_disch.roof,
+ :h_disch.street,
:h_disch.dwf,
:h_disch.flow_val,
:h_disch.flow_dist,
@@ -7658,6 +7669,7 @@
long disch_class_id;
char name [256];
char pop [ 41];
+ char paved_surface[41];
char roof [ 41];
char street [ 41];
char dwf [ 41];
@@ -7716,6 +7728,7 @@
h_catch_id_qry = vp_catch_id;
strcpy (h_disch.name , vp_disch.name);
strcpy (h_disch.pop , vp_disch.pop);
+ strcpy (h_disch.paved_surface, vp_disch.paved_surface);
strcpy (h_disch.roof , vp_disch.roof);
strcpy (h_disch.street , vp_disch.street);
strcpy (h_disch.dwf , vp_disch.dwf);
@@ -7739,6 +7752,7 @@
DISCH_CLASS_ID = :h_disch.disch_class_id,
NAME = :h_disch.name,
POP = :h_disch.pop,
+ PAVED_SURFACE = :h_disch.paved_surface,
ROOF = :h_disch.roof,
STREET = :h_disch.street,
DWF = :h_disch.dwf,
@@ -7842,6 +7856,7 @@
long disch_class_id;
char name [256];
char pop [ 41];
+ char paved_surface[41];
char roof [ 41];
char street [ 41];
char dwf [ 41];
@@ -13308,12 +13323,12 @@
USER_ID, PRIVS, STATUS,
CRE_DATE, MOD_DATE,
CONSUMPTION, ROOF_RUNOFF, STREET_RUNOFF,
- FLUX_NONDOM, FLUX_RUNOFF, REMARK )
+ FLUX_NONDOM, FLUX_RUNOFF, WWTP_REMOVAL, 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, ROOF_RUNOFF, STREET_RUNOFF,
- FLUX_NONDOM, FLUX_RUNOFF, REMARK
+ FLUX_NONDOM, FLUX_RUNOFF, WWTP_REMOVAL, REMARK
FROM MARKET_TAB
WHERE MARKET_ID = :h_sess.market_id
AND CATCH_ID = :h_sess.catch_id;
@@ -18964,6 +18979,7 @@
char street_runoff[41];
char flux_nondom[ 41];
char flux_runoff[ 41];
+ char wwtp_removal[41];
char remark[2001];
} h_market;
@@ -18982,6 +18998,7 @@
short int street_runoff;
short int flux_nondom;
short int flux_runoff;
+ short int wwtp_removal;
short int remark;
} h_ind_market;
@@ -19058,6 +19075,7 @@
"STREET_RUNOFF,"
"FLUX_NONDOM,"
"FLUX_RUNOFF,"
+ "WWTP_REMOVAL,"
"REMARK "
"FROM MARKET_TAB "
"%s "
@@ -19095,6 +19113,7 @@
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.wwtp_removal==-1) strcpy(h_market.wwtp_removal,"");
if (h_ind_market.remark == -1) strcpy(h_market.remark, "");
/* copy result into temp. buffer */
@@ -19112,6 +19131,7 @@
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.wwtp_removal,h_market.wwtp_removal);
strcpy(v_market_buf.remark , h_market.remark);
v_market_buf.next_element = NULL;
@@ -19285,6 +19305,7 @@
char street_runoff[41];
char flux_nondom[ 41];
char flux_runoff[ 41];
+ char wwtp_removal[41];
char remark[2001];
} h_market;
@@ -19380,6 +19401,7 @@
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.wwtp_removal,vp_market->wwtp_removal);
strcpy(h_market.remark , vp_market->remark);
/* Insert passed record */
@@ -19398,6 +19420,7 @@
STREET_RUNOFF,
FLUX_NONDOM,
FLUX_RUNOFF,
+ WWTP_REMOVAL,
REMARK )
VALUES ( :h_market.market_id,
:h_market.disch_id,
@@ -19413,6 +19436,7 @@
:h_market.street_runoff,
:h_market.flux_nondom,
:h_market.flux_runoff,
+ :h_market.wwtp_removal,
:h_market.remark);
/* set return value (created MARKET_ID,...) into passed struct/record */
@@ -19518,6 +19542,7 @@
char street_runoff[41];
char flux_nondom[ 41];
char flux_runoff[ 41];
+ char wwtp_removal[41];
char remark[2001];
} h_market;
@@ -19570,6 +19595,7 @@
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.wwtp_removal,vp_market->wwtp_removal);
strcpy(h_market.remark , vp_market->remark);
/* Update passed record in database */
@@ -19602,6 +19628,7 @@
STREET_RUNOFF = :h_market.street_runoff,
FLUX_NONDOM = :h_market.flux_nondom,
FLUX_RUNOFF = :h_market.flux_runoff,
+ WWTP_REMOVAL= :h_market.wwtp_removal,
REMARK = :h_market.remark
WHERE CATCH_ID = :h_catch_id_qry
AND DISCH_ID = :h_disch_id_qry
@@ -19709,6 +19736,7 @@
char street_runoff[41];
char flux_nondom[ 41];
char flux_runoff[ 41];
+ char wwtp_removal[41];
char remark[2001];
} h_market;
@@ -19727,6 +19755,7 @@
short int street_runoff;
short int flux_nondom;
short int flux_runoff;
+ short int wwtp_removal;
short int remark;
} h_ind_market;
More information about the Greater-commits
mailing list