[Greater-commits] r3853 - in trunk/GREAT-ER-DB: dagreater impl/postgresql
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Dec 2 12:19:58 CET 2011
Author: aheinecke
Date: 2011-12-02 12:19:56 +0100 (Fri, 02 Dec 2011)
New Revision: 3853
Modified:
trunk/GREAT-ER-DB/dagreater/apispec.py
trunk/GREAT-ER-DB/impl/postgresql/dagreater_pg.h
trunk/GREAT-ER-DB/impl/postgresql/datypes_pg.h
trunk/GREAT-ER-DB/impl/postgresql/gdagreater_pg.pgc
Log:
Add volume parameter for stretches
Modified: trunk/GREAT-ER-DB/dagreater/apispec.py
===================================================================
--- trunk/GREAT-ER-DB/dagreater/apispec.py 2011-12-01 11:14:45 UTC (rev 3852)
+++ trunk/GREAT-ER-DB/dagreater/apispec.py 2011-12-02 11:19:56 UTC (rev 3853)
@@ -103,6 +103,8 @@
('q_dist', Array('char', 12)),
('v_val', Array('char', 256)),
('v_dist', Array('char', 12)),
+ ('vol_val', Array('char', 256)),
+ ('vol_dist', Array('char', 12)),
('l', Array('char', 41)),
('d_val', Array('char', 256)),
('d_dist', Array('char', 12)),
Modified: trunk/GREAT-ER-DB/impl/postgresql/dagreater_pg.h
===================================================================
--- trunk/GREAT-ER-DB/impl/postgresql/dagreater_pg.h 2011-12-01 11:14:45 UTC (rev 3852)
+++ trunk/GREAT-ER-DB/impl/postgresql/dagreater_pg.h 2011-12-02 11:19:56 UTC (rev 3853)
@@ -515,6 +515,8 @@
char q_dist [ 12];
char v_val [256];
char v_dist [ 12];
+ char vol_val [256];
+ char vol_dist [ 12];
char l [ 41];
char d_val [256];
char d_dist [ 12];
@@ -536,6 +538,8 @@
short int q_dist;
short int v_val;
short int v_dist;
+ short int vol_val;
+ short int vol_dist;
short int l;
short int d_val;
short int d_dist;
Modified: trunk/GREAT-ER-DB/impl/postgresql/datypes_pg.h
===================================================================
--- trunk/GREAT-ER-DB/impl/postgresql/datypes_pg.h 2011-12-01 11:14:45 UTC (rev 3852)
+++ trunk/GREAT-ER-DB/impl/postgresql/datypes_pg.h 2011-12-02 11:19:56 UTC (rev 3853)
@@ -151,6 +151,8 @@
char q_dist [ 12];
char v_val [256];
char v_dist [ 12];
+ char vol_val [256];
+ char vol_dist [ 12];
char l [ 41];
char d_val [256];
char d_dist [ 12];
Modified: trunk/GREAT-ER-DB/impl/postgresql/gdagreater_pg.pgc
===================================================================
--- trunk/GREAT-ER-DB/impl/postgresql/gdagreater_pg.pgc 2011-12-01 11:14:45 UTC (rev 3852)
+++ trunk/GREAT-ER-DB/impl/postgresql/gdagreater_pg.pgc 2011-12-02 11:19:56 UTC (rev 3853)
@@ -5723,6 +5723,8 @@
char q_dist [ 12];
char v_val [256];
char v_dist [ 12];
+ char vol_val [256];
+ char vol_dist [ 12];
char l [ 41];
char d_val [256];
char d_dist [ 12];
@@ -5742,6 +5744,8 @@
short int q_dist;
short int v_val;
short int v_dist;
+ short int vol_val;
+ short int vol_dist;
short int l;
short int d_val;
short int d_dist;
@@ -5802,6 +5806,8 @@
"Q_DIST,"
"V_VAL,"
"V_DIST,"
+ "VOL_VAL,"
+ "VOL_DIST,"
"L,"
"D_VAL,"
"D_DIST "
@@ -5840,6 +5846,8 @@
if (h_ind_stretch.q_dist == -1) strcpy(h_stretch.q_dist, "");
if (h_ind_stretch.v_val == -1) strcpy(h_stretch.v_val, "");
if (h_ind_stretch.v_dist == -1) strcpy(h_stretch.v_dist, "");
+ if (h_ind_stretch.vol_val == -1) strcpy(h_stretch.vol_val, "");
+ if (h_ind_stretch.vol_dist == -1) strcpy(h_stretch.vol_dist, "");
if (h_ind_stretch.l == -1) strcpy(h_stretch.l, "");
if (h_ind_stretch.d_val == -1) strcpy(h_stretch.d_val, "");
if (h_ind_stretch.d_dist == -1) strcpy(h_stretch.d_dist, "");
@@ -5859,6 +5867,8 @@
strcpy(v_stretch_buf.q_dist, h_stretch.q_dist);
strcpy(v_stretch_buf.v_val, h_stretch.v_val);
strcpy(v_stretch_buf.v_dist, h_stretch.v_dist);
+ strcpy(v_stretch_buf.vol_dist, h_stretch.vol_dist);
+ strcpy(v_stretch_buf.vol_val, h_stretch.vol_val);
strcpy(v_stretch_buf.l, h_stretch.l);
strcpy(v_stretch_buf.d_val, h_stretch.d_val);
strcpy(v_stretch_buf.d_dist, h_stretch.d_dist);
@@ -6086,6 +6096,8 @@
char q_dist [ 12];
char v_val [256];
char v_dist [ 12];
+ char vol_val [256];
+ char vol_dist [ 12];
char l [ 41];
char d_val [256];
char d_dist [ 12];
@@ -6155,6 +6167,8 @@
strcpy(h_stretch.q_dist , vp_stretch->q_dist);
strcpy(h_stretch.v_val , vp_stretch->v_val);
strcpy(h_stretch.v_dist , vp_stretch->v_dist);
+ strcpy(h_stretch.vol_val , vp_stretch->vol_val);
+ strcpy(h_stretch.vol_dist , vp_stretch->vol_dist);
strcpy(h_stretch.l , vp_stretch->l);
strcpy(h_stretch.d_val , vp_stretch->d_val);
strcpy(h_stretch.d_dist , vp_stretch->d_dist);
@@ -6177,6 +6191,8 @@
Q_DIST,
V_VAL,
V_DIST,
+ VOL_VAL,
+ VOL_DIST,
L,
D_VAL,
D_DIST )
@@ -6193,6 +6209,8 @@
:h_stretch.q_dist,
:h_stretch.v_val,
:h_stretch.v_dist,
+ :h_stretch.vol_val,
+ :h_stretch.vol_dist,
:h_stretch.l,
:h_stretch.d_val,
:h_stretch.d_dist );
@@ -6290,6 +6308,8 @@
char q_dist [ 12];
char v_val [256];
char v_dist [ 12];
+ char vol_val [256];
+ char vol_dist [ 12];
char l [ 41];
char d_val [256];
char d_dist [ 12];
@@ -6343,6 +6363,8 @@
strcpy (h_stretch.q_dist , vp_stretch.q_dist);
strcpy (h_stretch.v_val , vp_stretch.v_val);
strcpy (h_stretch.v_dist , vp_stretch.v_dist);
+ strcpy (h_stretch.vol_val , vp_stretch.vol_val);
+ strcpy (h_stretch.vol_dist , vp_stretch.vol_dist);
strcpy (h_stretch.l , vp_stretch.l);
strcpy (h_stretch.d_val , vp_stretch.d_val);
strcpy (h_stretch.d_dist , vp_stretch.d_dist);
@@ -6362,6 +6384,8 @@
Q_DIST = :h_stretch.q_dist,
V_VAL = :h_stretch.v_val,
V_DIST = :h_stretch.v_dist,
+ VOL_VAL = :h_stretch.vol_val,
+ VOL_DIST = :h_stretch.vol_dist,
L = :h_stretch.l,
D_VAL = :h_stretch.d_val,
D_DIST = :h_stretch.d_dist
@@ -6463,6 +6487,8 @@
char q_dist [ 12];
char v_val [256];
char v_dist [ 12];
+ char vol_val [256];
+ char vol_dist [ 12];
char l [ 41];
char d_val [256];
char d_dist [ 12];
More information about the Greater-commits
mailing list