Mercurial > dive4elements > river
changeset 8214:ceeeaf228fe4
Allow fractions without SQ-time interval (suspended sediment) to be loaded.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Mon, 08 Sep 2014 10:03:00 +0200 |
| parents | ebdf34cae14d |
| children | 204905c16ade |
| files | artifacts/doc/conf/meta-data.xml |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml Fri Sep 05 20:57:31 2014 +0200 +++ b/artifacts/doc/conf/meta-data.xml Mon Sep 08 10:03:00 2014 +0200 @@ -1491,7 +1491,7 @@ ON ms.id = syv.measurement_station_id JOIN rivers r ON ms.river_id = r.id JOIN time_intervals ti ON sy.time_interval_id = ti.id - JOIN time_intervals sq ON sy.sq_time_interval_id = sq.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 WHERE r.id = ${river_id} AND ms.station BETWEEN ${fromkm} AND ${tokm} @@ -1523,7 +1523,7 @@ 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 - JOIN time_intervals sq ON sy.sq_time_interval_id = sq.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 WHERE r.id = ${river_id}