Mercurial > dive4elements > river
comparison artifacts/doc/conf/meta-data.xml @ 8335:9d62a8b4bf15
Throw non-lethal XPathException if not at gauge instead of lethal PSQLException if at gauge.
| author | "Tom Gottfried <tom@intevation.de>" |
|---|---|
| date | Fri, 26 Sep 2014 14:18:27 +0200 |
| parents | 38f57e854977 |
| children | b9fa8124583c |
comparison
equal
deleted
inserted
replaced
| 8334:38f57e854977 | 8335:9d62a8b4bf15 |
|---|---|
| 464 </dc:filter> | 464 </dc:filter> |
| 465 </dc:macro> | 465 </dc:macro> |
| 466 | 466 |
| 467 | 467 |
| 468 <dc:macro name="historical_discharge_curve"> | 468 <dc:macro name="historical_discharge_curve"> |
| 469 <dc:variable name="refgauge" type="number" | |
| 470 expr="dc:get('reference_gauge')"/> | |
| 469 <dc:context> | 471 <dc:context> |
| 470 <dc:statement> | 472 <dc:statement> |
| 471 SELECT g.id AS gauge_id, | 473 SELECT g.id AS gauge_id, |
| 472 g.name AS gauge_name, | 474 g.name AS gauge_name, |
| 473 dt.id AS dt_id, | 475 dt.id AS dt_id, |
| 478 JOIN discharge_tables dt ON g.id = dt.gauge_id | 480 JOIN discharge_tables dt ON g.id = dt.gauge_id |
| 479 LEFT JOIN time_intervals t ON dt.time_interval_id = t.id | 481 LEFT JOIN time_intervals t ON dt.time_interval_id = t.id |
| 480 WHERE g.river_id = ${river_id} | 482 WHERE g.river_id = ${river_id} |
| 481 AND dt.kind <> 0 | 483 AND dt.kind <> 0 |
| 482 AND ((g.station = ${fromkm} AND g.station = ${tokm}) | 484 AND ((g.station = ${fromkm} AND g.station = ${tokm}) |
| 483 OR g.official_number = ${reference_gauge}) | 485 OR g.official_number = ${refgauge}) |
| 484 ORDER BY start_time | 486 ORDER BY start_time |
| 485 </dc:statement> | 487 </dc:statement> |
| 486 <dc:if test="dc:has-result()"> | 488 <dc:if test="dc:has-result()"> |
| 487 <historical_discharge_curves> | 489 <historical_discharge_curves> |
| 488 <dc:group expr="$gauge_name"> | 490 <dc:group expr="$gauge_name"> |
| 1781 </dc:context> | 1783 </dc:context> |
| 1782 </sources_sinks> | 1784 </sources_sinks> |
| 1783 </dc:macro> | 1785 </dc:macro> |
| 1784 | 1786 |
| 1785 <dc:macro name="discharge_table_gauge"> | 1787 <dc:macro name="discharge_table_gauge"> |
| 1788 <dc:variable name="refgauge" type="number" | |
| 1789 expr="dc:get('reference_gauge')"/> | |
| 1786 <dc:context> | 1790 <dc:context> |
| 1787 <dc:statement> | 1791 <dc:statement> |
| 1788 SELECT g.id AS gauge_id, | 1792 SELECT g.id AS gauge_id, |
| 1789 g.name AS gauge_name, | 1793 g.name AS gauge_name, |
| 1790 t.start_time AS start_time, | 1794 t.start_time AS start_time, |
| 1793 JOIN discharge_tables dt ON g.id = dt.gauge_id | 1797 JOIN discharge_tables dt ON g.id = dt.gauge_id |
| 1794 LEFT JOIN time_intervals t ON dt.time_interval_id = t.id | 1798 LEFT JOIN time_intervals t ON dt.time_interval_id = t.id |
| 1795 WHERE g.river_id = ${river_id} | 1799 WHERE g.river_id = ${river_id} |
| 1796 AND dt.kind = 0 | 1800 AND dt.kind = 0 |
| 1797 AND ((g.station = ${fromkm} AND g.station = ${tokm}) | 1801 AND ((g.station = ${fromkm} AND g.station = ${tokm}) |
| 1798 OR g.official_number = ${reference_gauge}) | 1802 OR g.official_number = ${refgauge}) |
| 1799 </dc:statement> | 1803 </dc:statement> |
| 1800 <dc:if test="dc:has-result()"> | 1804 <dc:if test="dc:has-result()"> |
| 1801 <dc:for-each> | 1805 <dc:for-each> |
| 1802 <current_gauge factory="gaugedischarge" target_out="{$out}" | 1806 <current_gauge factory="gaugedischarge" target_out="{$out}" |
| 1803 ids="{$gauge_name}"/> | 1807 ids="{$gauge_name}"/> |