Mercurial > dive4elements > river
diff artifacts/doc/conf/meta-data.xml @ 8222:1cd7225df846
Let official epochs be showy and remove detritus of 'yields' in datacage config.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Mon, 08 Sep 2014 15:54:12 +0200 |
| parents | ceeeaf228fe4 |
| children | a65afd85d516 |
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml Mon Sep 08 15:48:11 2014 +0200 +++ b/artifacts/doc/conf/meta-data.xml Mon Sep 08 15:54:12 2014 +0200 @@ -1411,7 +1411,7 @@ factory="sedimentload" target_out="{$out}" info="{$info}" - ids="{$syid};{$fraction};{$timespan}" /> + ids="{$slid};{$fraction};{$timespan};{$kind}" /> </dc:macro> <dc:macro name="load_ls"> @@ -1419,7 +1419,7 @@ factory="sedimentload_ls" target_out="{$out}" info="{$info}" - ids="{$syid};{$timespan}" /> + ids="{$slid};{$timespan};{$kind}" /> </dc:macro> <dc:macro name="loads"> @@ -1439,6 +1439,10 @@ '-', dc:date-format('yyyy', $endyear))"/> </dc:otherwise> </dc:choose> + <dc:if test="$kind = 'official'"> + <dc:variable name="info" type="string" + expr="concat('Amtliche Epoche<BR>', $info)"/> + </dc:if> <dc:macro-body/> </dc:for-each> </fraction> @@ -1475,24 +1479,26 @@ <dc:context> <dc:statement> SELECT DISTINCT - sy.id AS syid, + sl.id AS slid, + slk.kind AS kind, ti.start_time AS startyear, ti.stop_time AS endyear, sq.start_time AS sqstart, sq.stop_time AS sqstop, gf.name AS fraction, - sy.description || '<BR>' || + sl.description || '<BR>' || 'Fraktion: ' || gf.lower || ' bis ' || gf.upper || ' mm<BR>Einheit: t/a' AS info - FROM sediment_load sy - JOIN sediment_load_values syv - ON sy.id = syv.sediment_load_id + FROM sediment_load sl + JOIN sediment_load_kinds slk ON slk.id = sl.kind + JOIN sediment_load_values slv + ON sl.id = slv.sediment_load_id JOIN measurement_station ms - ON ms.id = syv.measurement_station_id + ON ms.id = slv.measurement_station_id JOIN rivers r ON ms.river_id = r.id - JOIN time_intervals ti ON sy.time_interval_id = ti.id - LEFT JOIN time_intervals sq ON sy.sq_time_interval_id = sq.id - JOIN grain_fraction gf ON gf.id = sy.grain_fraction_id + JOIN time_intervals ti ON sl.time_interval_id = ti.id + LEFT JOIN time_intervals sq ON sl.sq_time_interval_id = sq.id + JOIN grain_fraction gf ON gf.id = sl.grain_fraction_id WHERE r.id = ${river_id} AND ms.station BETWEEN ${fromkm} AND ${tokm} ORDER BY sqstart DESC, sqstop DESC, @@ -1509,25 +1515,27 @@ <dc:context> <dc:statement> SELECT DISTINCT - sy.id AS syid, + sl.id AS slid, + slk.kind AS kind, ti.start_time AS startyear, ti.stop_time AS endyear, sq.start_time AS sqstart, sq.stop_time AS sqstop, gf.name AS fraction, - sy.description || '<BR>' || + sl.description || '<BR>' || 'Fraktion: ' || gf.lower || ' bis ' || gf.upper || ' mm<BR>Einheit: ' || u.name AS info - FROM sediment_load_ls sy - JOIN rivers r ON sy.river_id = r.id - JOIN sediment_load_ls_values syv - ON sy.id = syv.sediment_load_ls_id - JOIN time_intervals ti ON sy.time_interval_id = ti.id - LEFT JOIN time_intervals sq ON sy.sq_time_interval_id = sq.id - JOIN grain_fraction gf ON gf.id = sy.grain_fraction_id - JOIN units u ON sy.unit_id = u.id + FROM sediment_load_ls sl + JOIN sediment_load_kinds slk ON slk.id = sl.kind + JOIN rivers r ON sl.river_id = r.id + JOIN sediment_load_ls_values slv + ON sl.id = slv.sediment_load_ls_id + JOIN time_intervals ti ON sl.time_interval_id = ti.id + LEFT JOIN time_intervals sq ON sl.sq_time_interval_id = sq.id + JOIN grain_fraction gf ON gf.id = sl.grain_fraction_id + JOIN units u ON sl.unit_id = u.id WHERE r.id = ${river_id} - AND syv.station BETWEEN ${fromkm} AND ${tokm} + AND slv.station BETWEEN ${fromkm} AND ${tokm} ORDER BY sqstart DESC, sqstop DESC, fraction, startyear DESC, endyear DESC </dc:statement>