[Greater-commits] r3737 - 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:55:53 CEST 2011
Author: aheinecke
Date: 2011-07-28 15:55:52 +0200 (Thu, 28 Jul 2011)
New Revision: 3737
Modified:
branches/3.0.0-usf/GREAT-ER-DB-trunk/
branches/3.0.0-usf/GREAT-ER-DB-trunk/ChangeLog
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 166 via svnmerge from
svn+ssh://wald.intevation.org/greater/branches/GREAT-ER-DB/usf
........
r166 | nhueffme | 2009-01-16 12:27:23 +0100 (Fri, 16 Jan 2009) | 3 lines
Added parameter 'paved_surface' to the sess_disch attributes, so WWTP parameter can be overwritten
in a session.
........
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,163-165,217
+ /branches/GREAT-ER-DB/usf:1-133,137-143,150-158,163-166,217
Modified: branches/3.0.0-usf/GREAT-ER-DB-trunk/ChangeLog
===================================================================
--- branches/3.0.0-usf/GREAT-ER-DB-trunk/ChangeLog 2011-07-28 13:49:16 UTC (rev 3736)
+++ branches/3.0.0-usf/GREAT-ER-DB-trunk/ChangeLog 2011-07-28 13:55:52 UTC (rev 3737)
@@ -1,5 +1,9 @@
2006-05-10 Frank Koormann <frank at intevation.de>
2009-01-16 Nina Hueffmeyer <nhueffme at usf.uos.de>
+ * The WWTP parameter 'PAVED_SURFACE' can be replaced in the
+ session discharge data.
+
+2009-01-16 Nina Hueffmeyer <nhueffme at usf.uos.de>
* The substance parameter 'DEFAULT_SURFACEPOTENTIAL' can be replaced
in the market data by the parameter 'SURFACE_POTENTIAL'.
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:49:16 UTC (rev 3736)
+++ branches/3.0.0-usf/GREAT-ER-DB-trunk/dagreater/apispec.py 2011-07-28 13:55:52 UTC (rev 3737)
@@ -659,6 +659,7 @@
('status', Array('char', 31)),
('privs', 'int'),
('pop', Array('char', 41)),
+ ('paved_surface', Array('char', 41)),
('roof', Array('char', 41)),
('street', Array('char', 41)),
('dwf', Array('char', 41)),
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:49:16 UTC (rev 3736)
+++ branches/3.0.0-usf/GREAT-ER-DB-trunk/impl/postgresql/dagreater_pg.h 2011-07-28 13:55:52 UTC (rev 3737)
@@ -1375,6 +1375,7 @@
char status [ 31];
int privs;
char pop [ 41];
+ char paved_surface[41];
char roof [ 41];
char street [ 41];
char dwf [ 41];
@@ -1403,6 +1404,7 @@
short int status;
short int privs;
short int pop;
+ short int paved_surface;
short int roof;
short int street;
short int dwf;
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:49:16 UTC (rev 3736)
+++ branches/3.0.0-usf/GREAT-ER-DB-trunk/impl/postgresql/datypes_pg.h 2011-07-28 13:55:52 UTC (rev 3737)
@@ -690,6 +690,7 @@
char status [ 31];
int privs;
char pop [ 41];
+ char paved_surface[41];
char roof [ 41];
char street [ 41];
char dwf [ 41];
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:49:16 UTC (rev 3736)
+++ branches/3.0.0-usf/GREAT-ER-DB-trunk/impl/postgresql/gdagreater_pg.pgc 2011-07-28 13:55:52 UTC (rev 3737)
@@ -13421,8 +13421,8 @@
EXEC SQL INSERT INTO SESS_DISCH_TAB ( SESS_DISCH_ID, DISCH_ID, STRETCH_ID,
CATCH_ID, DISCH_CLASS_ID, NAME,
USER_ID, PRIVS, STATUS,
- CRE_DATE, MOD_DATE,
- POP, ROOF, STREET,
+ CRE_DATE, MOD_DATE, POP,
+ PAVED_SURFACE, ROOF, STREET,
DWF, FLOW_VAL, FLOW_DIST,
FLOW_DOM, FLOW_NONDOM, FLOW_RUNOFF,
TREATED, R_WWTP, REMARK )
@@ -13430,7 +13430,8 @@
CATCH_ID, DISCH_CLASS_ID, NAME,
:h_temp_user_id, PRIVS, STATUS,
CRE_DATE, to_timestamp(:h_sess.mod_date,:h_fmt_date),
- POP, ROOF, STREET,
+ POP, PAVED_SURFACE,
+ ROOF, STREET,
DWF, FLOW_VAL, FLOW_DIST,
FLOW_DOM, FLOW_NONDOM, FLOW_RUNOFF,
TREATED, R_WWTP, REMARK
@@ -14157,6 +14158,7 @@
char status [ 31];
int privs;
char pop [ 41];
+ char paved_surface[41];
char roof [ 41];
char street [ 41];
char dwf [ 41];
@@ -14183,6 +14185,7 @@
short int status;
short int privs;
short int pop;
+ short int paved_surface;
short int roof;
short int street;
short int dwf;
@@ -14266,6 +14269,7 @@
"STATUS,"
"PRIVS,"
"POP,"
+ "PAVED_SURFACE,"
"ROOF,"
"STREET,"
"DWF,"
@@ -14311,6 +14315,7 @@
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.paved_surface == -1) strcpy(h_sess_disch.paved_surface, "");
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, "");
@@ -14336,6 +14341,7 @@
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.paved_surface , h_sess_disch.paved_surface);
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);
@@ -14510,6 +14516,7 @@
char status [ 31];
int privs;
char pop [ 41];
+ char paved_surface[41];
char roof [ 41];
char street [ 41];
char dwf [ 41];
@@ -14610,8 +14617,9 @@
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.paved_surface , vp_sess_disch->paved_surface);
strcpy(h_sess_disch.roof , vp_sess_disch->roof);
- strcpy(h_sess_disch.street , vp_sess_disch->street);
+ 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);
@@ -14636,6 +14644,7 @@
STATUS,
PRIVS,
POP,
+ PAVED_SURFACE,
ROOF,
STREET,
DWF,
@@ -14659,6 +14668,7 @@
:h_sess_disch.status,
:h_sess_disch.privs,
:h_sess_disch.pop,
+ :h_sess_disch.paved_surface,
:h_sess_disch.roof,
:h_sess_disch.street,
:h_sess_disch.dwf,
@@ -14771,6 +14781,7 @@
char status [ 31];
int privs;
char pop [ 41];
+ char paved_surface[41];
char roof [ 41];
char street [ 41];
char dwf [ 41];
@@ -14828,6 +14839,7 @@
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.paved_surface, vp_sess_disch->paved_surface);
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);
@@ -14872,6 +14884,7 @@
STATUS = :h_sess_disch.status,
PRIVS = :h_sess_disch.privs,
POP = :h_sess_disch.pop,
+ PAVED_SURFACE = :h_sess_disch.paved_surface,
ROOF = :h_sess_disch.roof,
STREET = :h_sess_disch.street,
DWF = :h_sess_disch.dwf,
@@ -14989,6 +15002,7 @@
char status [ 31];
int privs;
char pop [ 41];
+ char paved_surface[41];
char roof [ 41];
char street [ 41];
char dwf [ 41];
@@ -15017,6 +15031,7 @@
short int status;
short int privs;
short int pop;
+ short int paved_surface;
short int roof;
short int street;
short int dwf;
More information about the Greater-commits
mailing list