comparison artifacts/doc/conf/meta-data.xml @ 7195:c0349b54c604

issue1435: Remove hardcoded river for dc sediment yield sql query.
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Fri, 27 Sep 2013 22:09:12 +0200
parents 7bd19eff9bca
children b893e1d0ddc7
comparison
equal deleted inserted replaced
7192:5be5bf32bead 7195:c0349b54c604
1240 ti.start_time AS year 1240 ti.start_time AS year
1241 FROM sediment_yield sy 1241 FROM sediment_yield sy
1242 JOIN rivers r ON sy.river_id = r.id 1242 JOIN rivers r ON sy.river_id = r.id
1243 JOIN sediment_yield_values syv ON sy.id = syv.sediment_yield_id 1243 JOIN sediment_yield_values syv ON sy.id = syv.sediment_yield_id
1244 JOIN time_intervals ti ON sy.time_interval_id = ti.id 1244 JOIN time_intervals ti ON sy.time_interval_id = ti.id
1245 WHERE r.name = 'Elbe' 1245 WHERE r.id = ${river_id}
1246 AND ti.stop_time IS NULL 1246 AND ti.stop_time IS NULL
1247 AND syv.station BETWEEN ${fromkm} AND ${tokm} 1247 AND syv.station BETWEEN ${fromkm} AND ${tokm}
1248 </dc:statement> 1248 </dc:statement>
1249 <dc:if test="dc:has-result()"> 1249 <dc:if test="dc:has-result()">
1250 <dc:for-each> 1250 <dc:for-each>
1266 ti.start_time AS year 1266 ti.start_time AS year
1267 FROM sediment_yield sy 1267 FROM sediment_yield sy
1268 JOIN rivers r ON sy.river_id = r.id 1268 JOIN rivers r ON sy.river_id = r.id
1269 JOIN sediment_yield_values syv ON sy.id = syv.sediment_yield_id 1269 JOIN sediment_yield_values syv ON sy.id = syv.sediment_yield_id
1270 JOIN time_intervals ti ON sy.time_interval_id = ti.id 1270 JOIN time_intervals ti ON sy.time_interval_id = ti.id
1271 WHERE r.name = 'Elbe' 1271 WHERE r.id = ${river_id}
1272 AND ti.stop_time IS NOT NULL 1272 AND ti.stop_time IS NOT NULL
1273 AND syv.station BETWEEN ${fromkm} AND ${tokm} 1273 AND syv.station BETWEEN ${fromkm} AND ${tokm}
1274 </dc:statement> 1274 </dc:statement>
1275 <dc:if test="dc:has-result()"> 1275 <dc:if test="dc:has-result()">
1276 <dc:for-each> 1276 <dc:for-each>

http://dive4elements.wald.intevation.org