[Greater-commits] r3753 - branches/3.0.0-usf/greater-pre-processing

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-29 16:29:16 +0200 (Fri, 29 Jul 2011)
New Revision: 3753

Modified:
   branches/3.0.0-usf/greater-pre-processing/upload-catchment.py
Log:
Fill database with 0 parameters in case of error


Modified: branches/3.0.0-usf/greater-pre-processing/upload-catchment.py
===================================================================
--- branches/3.0.0-usf/greater-pre-processing/upload-catchment.py	2011-07-29 13:31:25 UTC (rev 3752)
+++ branches/3.0.0-usf/greater-pre-processing/upload-catchment.py	2011-07-29 14:29:16 UTC (rev 3753)
@@ -206,7 +206,10 @@
                     'd_dist'            : '2',
                     'vol_val'           : '%e;%e' % (float(d[15]),
                           float(LogNorm_FivePercentileToStddev((d[15],d[16])))),
-                    'vol_dist'            : '2'
+                    'vol_dist'          : '2',
+                    'baseflow'          : '%e' % float(0),
+                    'agriculture'       : '%e' % float(0),
+                    'natural_soil'      : '%e' % float(0)
                 })
             GreaterDB.interface.da_insert_stretch(record)
 
@@ -230,17 +233,21 @@
                 record = GreaterDB.interface.DA_S_disch({'disch_id': int(d[0]),
                     'stretch_id'    : int(d[1]),
                     'catch_id'      : catch_id,
-                    'disch_class_id': int(d[10]),
                     'name'          : name,
                     'pop'           : '%e' % float(d[3]),
-                    'dwf'           : '%e' % float(d[4]),
+                    'paved_surface' : '%e' % float(0),
+                    'roof'          : '%e' % float(0),
+                    'roof_indust'   : '%e' % float(0),
+                    'street'        : '%e' % float(0),
+                    'srt'           : '%e' % float(0),
                     'flow_val'      : '%e' % float(d[8]),
                     'flow_dist'     : '0',
-                    'flow_dom'      : '%e' % float(d[5]),
-                    'flow_nondom'   : '%e' % float(d[6]),
-                    'flow_runoff'   : '%e' % float(d[7]),
-                    'treated'       : '%e' % float(d[9]),
-                    'r_wwtp'        : '',
+                    'mlss'          : '%e' % float(0),
+                    'vol_vk'        : '%e' % float(0),
+                    'vol_bb'        : '%e' % float(0),
+                    'f_mix'         : '%e' % float(0),
+                    'type'          : '%e' % float(0),
+                    'vol_sewer'     : '%e' % float(0),
                     'remark'        : ''})
                 GreaterDB.interface.da_insert_disch(record)