Mercurial > dive4elements > river
changeset 3582:e08bc99e097f
Show former calculations in Fix/DeltaWT DC, fixes.
flys-artifacts/trunk@5198 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Mon, 13 Aug 2012 12:04:01 +0000 |
| parents | 261a7445594a |
| children | 18d9b7af3783 |
| files | flys-artifacts/ChangeLog flys-artifacts/doc/conf/meta-data.xml |
| diffstat | 2 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Mon Aug 13 11:53:40 2012 +0000 +++ b/flys-artifacts/ChangeLog Mon Aug 13 12:04:01 2012 +0000 @@ -1,3 +1,8 @@ +2012-08-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + * doc/conf/meta-data.xml: Show more former calculations in DeltaWTs + and fix query (and/or/() precedences). + 2012-08-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> * doc/conf/meta-data.xml: Show more former calculations in fixA LS.
--- a/flys-artifacts/doc/conf/meta-data.xml Mon Aug 13 11:53:40 2012 +0000 +++ b/flys-artifacts/doc/conf/meta-data.xml Mon Aug 13 12:04:01 2012 +0000 @@ -1492,7 +1492,7 @@ <dc:statement> SELECT name AS facet_name, num as facet_num, description AS facet_description FROM facets - WHERE out_id = ${out_id} AND name LIKE 'fix_deviation_ls%' OR name LIKE 'fix_sector_average_ls%' + WHERE out_id = ${out_id} AND ( name LIKE 'fix_deviation_ls%' OR name LIKE 'fix_sector_average_ls%' ) ORDER BY num ASC, name DESC </dc:statement> <waterlevels> @@ -1533,14 +1533,14 @@ <dc:statement> SELECT id AS out_id FROM outs - WHERE artifact_id = ${a_id} AND name = 'longitudinal_section' + WHERE artifact_id = ${a_id} AND name = 'fix_deltawt_curve' </dc:statement> <dc:elements> <dc:context> <dc:statement> SELECT name AS facet_name, num as facet_num, description AS facet_description FROM facets - WHERE out_id = ${out_id} and name = 'longitudinal_section.w' + WHERE out_id = ${out_id} and ( name LIKE 'fix_sector_average_dwt%' OR name LIKE 'fix_deviation_dwt%' ) ORDER BY num ASC, name DESC </dc:statement> <waterlevels> @@ -1549,9 +1549,9 @@ <dc:element name="${facet_name}"> <dc:attribute name="description" value="${facet_description}"/> <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="factory" value="winfo"/> + <dc:attribute name="factory" value="fixanalysis"/> <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="longitudinal_section"/> + <dc:attribute name="out" value="fix_deltawt_curve"/> </dc:element> </dc:elements> </waterlevels>