# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1344859441 0
# Node ID e08bc99e097f353bbd3affedc2e204ccb4df89a0
# Parent  261a7445594a7d5c88292301158100005ca4eaeb
Show former calculations in Fix/DeltaWT DC, fixes.

flys-artifacts/trunk@5198 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 261a7445594a -r e08bc99e097f flys-artifacts/ChangeLog
--- 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.
diff -r 261a7445594a -r e08bc99e097f flys-artifacts/doc/conf/meta-data.xml
--- 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>