# HG changeset patch # User Felix Wolfsteller # Date 1337590978 0 # Node ID 4cd55689e9a918cf7dbc7789ca09db58acfa306e # Parent 150dcdefeb7d731d01a3f1b3898b2713fdf77ee3 Allow to load previous DurationCurves and fixations in Dur.C. via DC. flys-artifacts/trunk@4446 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 150dcdefeb7d -r 4cd55689e9a9 flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Fri May 18 12:44:20 2012 +0000 +++ b/flys-artifacts/ChangeLog Mon May 21 09:02:58 2012 +0000 @@ -1,3 +1,8 @@ +2012-05-21 Felix Wolfsteller + + * doc/conf/meta-data.xml: Allow loading of previous duration curves and + fixations in duration curves. + 2012-05-18 Ingo Weinzierl * src/main/java/de/intevation/flys/artifacts/states/SoundingsSelect.java: diff -r 150dcdefeb7d -r 4cd55689e9a9 flys-artifacts/doc/conf/meta-data.xml --- a/flys-artifacts/doc/conf/meta-data.xml Fri May 18 12:44:20 2012 +0000 +++ b/flys-artifacts/doc/conf/meta-data.xml Mon May 21 09:02:58 2012 +0000 @@ -505,7 +505,15 @@ - + + + + + + + + + @@ -1092,7 +1100,7 @@ SELECT a.gid as aid, f.id AS fid, f.name AS facet_name, f.num AS facet_num, f.description as facet_description FROM outs as o, facets as f, artifacts as a - WHERE f.name = 'duration_curve.q' and f.out_id = o.id and o.artifact_id = ${a_id} and a.id = ${a_id} + WHERE (f.name = 'duration_curve.q' or f.name = 'duration_curve.w') and f.out_id = o.id and o.artifact_id = ${a_id} and a.id = ${a_id}