[Greater-commits] r3736 - 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:49:17 CEST 2011
Author: aheinecke
Date: 2011-07-28 15:49:16 +0200 (Thu, 28 Jul 2011)
New Revision: 3736
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 165 via svnmerge from
svn+ssh://wald.intevation.org/greater/branches/GREAT-ER-DB/usf
........
r165 | nhueffme | 2009-01-16 11:39:38 +0100 (Fri, 16 Jan 2009) | 2 lines
The parameter 'surface_potential' has been added to the market_data table.
........
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-164,217
+ /branches/GREAT-ER-DB/usf:1-133,137-143,150-158,163-165,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:47:02 UTC (rev 3735)
+++ branches/3.0.0-usf/GREAT-ER-DB-trunk/ChangeLog 2011-07-28 13:49:16 UTC (rev 3736)
@@ -1,5 +1,9 @@
2006-05-10 Frank Koormann <frank at intevation.de>
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'.
+
+2009-01-16 Nina Hueffmeyer <nhueffme at usf.uos.de>
* For the new emission mode 2, the WWTPs now require the parameter
'paved_surface'. In the substance's parameter set, 'DEFAULT_SURFACEPOTENTIAL'
has been added.
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:47:02 UTC (rev 3735)
+++ branches/3.0.0-usf/GREAT-ER-DB-trunk/dagreater/apispec.py 2011-07-28 13:49:16 UTC (rev 3736)
@@ -612,6 +612,7 @@
('status', Array('char', 31)),
('privs', 'int'),
('consumption', Array('char', 41)),
+ ('surface_potential', Array('char', 41)),
('roof_runoff', Array('char', 41)),
('street_runoff', Array('char', 41)),
('flux_nondom', 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:47:02 UTC (rev 3735)
+++ branches/3.0.0-usf/GREAT-ER-DB-trunk/impl/postgresql/dagreater_pg.h 2011-07-28 13:49:16 UTC (rev 3736)
@@ -1040,6 +1040,7 @@
char status [ 31];
int privs;
char consumption[ 41];
+ char surface_potential[41];
char roof_runoff[ 41];
char street_runoff[41];
char flux_nondom[ 41];
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:47:02 UTC (rev 3735)
+++ branches/3.0.0-usf/GREAT-ER-DB-trunk/impl/postgresql/datypes_pg.h 2011-07-28 13:49:16 UTC (rev 3736)
@@ -466,6 +466,7 @@
char status [ 31];
int privs;
char consumption[ 41];
+ char surface_potential[41];
char roof_runoff[ 41];
char street_runoff[41];
char flux_nondom[ 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:47:02 UTC (rev 3735)
+++ branches/3.0.0-usf/GREAT-ER-DB-trunk/impl/postgresql/gdagreater_pg.pgc 2011-07-28 13:49:16 UTC (rev 3736)
@@ -13321,13 +13321,13 @@
errln = 180;
EXEC SQL INSERT INTO MARKET_TAB ( MARKET_ID, DISCH_ID, CATCH_ID, NAME,
USER_ID, PRIVS, STATUS,
- CRE_DATE, MOD_DATE,
- CONSUMPTION, ROOF_RUNOFF, STREET_RUNOFF,
+ CRE_DATE, MOD_DATE, CONSUMPTION,
+ SURFACE_POTENTIAL, ROOF_RUNOFF, STREET_RUNOFF,
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,
+ CONSUMPTION, SURFACE_POTENTIAL, ROOF_RUNOFF, STREET_RUNOFF,
FLUX_NONDOM, FLUX_RUNOFF, WWTP_REMOVAL, REMARK
FROM MARKET_TAB
WHERE MARKET_ID = :h_sess.market_id
@@ -18975,6 +18975,7 @@
char status [ 31];
int privs;
char consumption[ 41];
+ char surface_potential[41];
char roof_runoff[ 41];
char street_runoff[41];
char flux_nondom[ 41];
@@ -18994,6 +18995,7 @@
short int status;
short int privs;
short int consumption;
+ short int surface_potential;
short int roof_runoff;
short int street_runoff;
short int flux_nondom;
@@ -19071,6 +19073,7 @@
"STATUS,"
"PRIVS,"
"CONSUMPTION,"
+ "SURFACE_POTENTIAL,"
"ROOF_RUNOFF,"
"STREET_RUNOFF,"
"FLUX_NONDOM,"
@@ -19109,6 +19112,7 @@
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.surface_potential==-1) strcpy(h_market.surface_potential, "");
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, "");
@@ -19127,6 +19131,7 @@
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.surface_potential, h_market.surface_potential);
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);
@@ -19301,6 +19306,7 @@
char status [ 31];
int privs;
char consumption[ 41];
+ char surface_potential[41];
char roof_runoff[ 41];
char street_runoff[41];
char flux_nondom[ 41];
@@ -19397,6 +19403,7 @@
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.surface_potential, vp_market->surface_potential);
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);
@@ -19416,6 +19423,7 @@
STATUS,
PRIVS,
CONSUMPTION,
+ SURFACE_POTENTIAL,
ROOF_RUNOFF,
STREET_RUNOFF,
FLUX_NONDOM,
@@ -19432,6 +19440,7 @@
:h_market.status,
:h_market.privs,
:h_market.consumption,
+ :h_market.surface_potential,
:h_market.roof_runoff,
:h_market.street_runoff,
:h_market.flux_nondom,
@@ -19538,6 +19547,7 @@
char status [ 31];
int privs;
char consumption[ 41];
+ char surface_potential[41];
char roof_runoff[ 41];
char street_runoff[41];
char flux_nondom[ 41];
@@ -19591,6 +19601,7 @@
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.surface_potential, vp_market->surface_potential);
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);
@@ -19624,6 +19635,7 @@
STATUS = :h_market.status,
PRIVS = :h_market.privs,
CONSUMPTION = :h_market.consumption,
+ SURFACE_POTENTIAL = :h_market.surface_potential,
ROOF_RUNOFF = :h_market.roof_runoff,
STREET_RUNOFF = :h_market.street_runoff,
FLUX_NONDOM = :h_market.flux_nondom,
@@ -19732,6 +19744,7 @@
char status [ 31];
int privs;
char consumption[ 41];
+ char surface_potential[41];
char roof_runoff[ 41];
char street_runoff[41];
char flux_nondom[ 41];
@@ -19751,6 +19764,7 @@
short int status;
short int privs;
short int consumption;
+ short int surface_potential;
short int roof_runoff;
short int street_runoff;
short int flux_nondom;
More information about the Greater-commits
mailing list