Mercurial > dive4elements > river
comparison artifacts/doc/conf/meta-data.xml @ 6690:0b0325d1ab7f
issue1391: Fix syntax in gauge macros and add km filtering
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Mon, 29 Jul 2013 12:14:51 +0200 |
| parents | e5b3298d4882 |
| children | f41ba63e7a43 |
comparison
equal
deleted
inserted
replaced
| 6689:e568788f519d | 6690:0b0325d1ab7f |
|---|---|
| 1282 </dc:macro> | 1282 </dc:macro> |
| 1283 | 1283 |
| 1284 <dc:macro name="discharge_table_gauge"> | 1284 <dc:macro name="discharge_table_gauge"> |
| 1285 <dc:context> | 1285 <dc:context> |
| 1286 <dc:statement> | 1286 <dc:statement> |
| 1287 SELECT id AS gauge_id, | 1287 SELECT g.id AS gauge_id, |
| 1288 name AS gauge_name | 1288 g.name AS gauge_name |
| 1289 FROM gauges WHERE river_id = ${river_id} | 1289 FROM gauges g |
| 1290 LEFT JOIN ranges r ON g.range_id = r.id | |
| 1291 WHERE g.river_id = ${river_id} | |
| 1292 AND NOT((${tokm} < r.a) or (${fromkm} > r.b)) | |
| 1290 </dc:statement> | 1293 </dc:statement> |
| 1291 <dc:if test="dc:has-result()"> | 1294 <dc:if test="dc:has-result()"> |
| 1292 <discharge_table_nn> | 1295 <discharge_table_gauge> |
| 1293 <discharge_table_gauge> | 1296 <dc:for-each> |
| 1294 <dc:for-each> | 1297 <gauge name="{$gauge_name}" |
| 1295 <gauge name="{$gauge_name}" | 1298 factory="gaugedischarge" target_out="{$out}" |
| 1296 factory="gaugedischarge" target_out="{$out}" | 1299 ids="{$gauge_name}"/> |
| 1297 from="{$g_start}" | 1300 </dc:for-each> |
| 1298 to="{$g_stop}" | 1301 </discharge_table_gauge> |
| 1299 ids="{$gauge_name}"/> | |
| 1300 </dc:for-each> | |
| 1301 </discharge_table_gauge> | |
| 1302 </discharge_table_nn> | |
| 1303 </dc:if> | 1302 </dc:if> |
| 1304 </dc:context> | 1303 </dc:context> |
| 1305 </dc:macro> | 1304 </dc:macro> |
| 1306 | 1305 |
| 1307 <dc:macro name="qsectors"> | 1306 <dc:macro name="qsectors"> |