# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1313676815 0
# Node ID 9c0f981cd22d4c793e2b755e1c13f600f873ab8a
# Parent  8873c43119ca5decd40a25b22c426f79052a34d9
Datacage user template: Removed state filter because it was broken. Simplified by joining two contexts.


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

diff -r 8873c43119ca -r 9c0f981cd22d flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Thu Aug 18 14:09:54 2011 +0000
+++ b/flys-artifacts/ChangeLog	Thu Aug 18 14:13:35 2011 +0000
@@ -1,3 +1,8 @@
+2011-08-18  Sascha L. Teichmann <sascha.teichmann@intevation.de>
+
+	* doc/conf/meta-data-user.xml: Removed state filter because it was broken.
+	  Simplified by joining two contexts.
+
 2011-08-18  Felix Wolfsteller <felix.wolfsteller@intevation.de>
 
 	* src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java:
diff -r 8873c43119ca -r 9c0f981cd22d flys-artifacts/doc/conf/meta-data-user.xml
--- a/flys-artifacts/doc/conf/meta-data-user.xml	Thu Aug 18 14:09:54 2011 +0000
+++ b/flys-artifacts/doc/conf/meta-data-user.xml	Thu Aug 18 14:13:35 2011 +0000
@@ -8,47 +8,46 @@
   <dc:if test="dc:contains($parameters, 'user-id')">
     <old_calculations>
       <dc:context connection="user">
-        <dc:statement>SELECT id as user_id FROM users WHERE gid = CAST(${user-id} AS uuid)</dc:statement>
+        <dc:statement>SELECT u.id AS user_id, c.id AS collection_id
+                      FROM collections c JOIN users u ON c.user_id = u.id
+                      WHERE u.gid = CAST(${user-id} AS uuid)
+                      ORDER BY c.creation DESC
+        </dc:statement>
         <dc:elements>
           <dc:context>
-            <dc:statement>SELECT id AS collection_id FROM collections WHERE user_id = ${user_id}</dc:statement>
+            <dc:statement>SELECT a.id AS a_id, a.state AS a_state, a.gid AS a_gid, a.creation AS a_creation
+                          FROM collection_items ci JOIN artifacts a ON ci.artifact_id = a.id
+                          WHERE collection_id = ${collection_id} AND a.gid &lt;&gt; CAST(${artifact-id} AS uuid)
+                          AND EXISTS (SELECT id FROM artifact_data WHERE artifact_id = a.id AND k = 'river' AND v = ${river})
+            </dc:statement>
+            <dc:comment> --- TODO: We only need the 'master' artifacts! --- </dc:comment>
             <dc:elements>
-              <dc:context>
-                <dc:statement>SELECT a.id AS a_id, a.state AS a_state, a.gid AS a_gid, a.creation AS a_creation FROM 
-                              collection_items ci JOIN artifacts a ON ci.artifact_id = a.id
-                              WHERE collection_id = ${collection_id} AND a.state = ${current-state-id} AND a.gid &lt;&gt; CAST(${artifact-id} AS uuid)
-                              AND EXISTS (SELECT id FROM artifact_data WHERE artifact_id = a.id AND k = 'river' AND v = ${river})
-                              ORDER BY a.creation DESC
-                </dc:statement>
-                <dc:comment> --- TODO: We only need the 'master' artifacts! --- </dc:comment>
-                <dc:elements>
-                  <dc:choose>
-                    <dc:when test="$current-state-id = 'state.winfo.waterlevel'">
+              <dc:choose>
+                <dc:when test="$current-state-id = 'state.winfo.waterlevel'">
+                  <dc:context>
+                    <dc:statement>SELECT id AS out_id FROM outs WHERE artifact_id = ${a_id} AND name = 'longitudinal_section'
+                    </dc:statement>
+                    <dc:elements>
                       <dc:context>
-                        <dc:statement>SELECT id AS out_id FROM outs WHERE artifact_id = ${a_id} AND name = 'longitudinal_section'</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} ORDER BY num ASC, name DESC
-                            </dc:statement>
-                            <longitudinal_section_columns>
-                                <dc:attribute name="description" value="${river} ${a_creation}"/>
-                                <dc:elements>
-                                  <dc:element name="${facet_name}">
-                                    <dc:attribute name="description" value="${facet_description}"/>
-                                    <dc:attribute name="num" value="${facet_num}"/>
-                                    <dc:attribute name="factory" value="TODO"/>
-                                    <dc:attribute name="artifact-id" value="${a_gid}"/>
-                                  </dc:element>
-                                </dc:elements>
-                            </longitudinal_section_columns>
-                          </dc:context>
-                        </dc:elements>
+                        <dc:statement>SELECT name AS facet_name, num as facet_num, description AS facet_description
+                                      FROM facets WHERE out_id = ${out_id} ORDER BY num ASC, name DESC
+                        </dc:statement>
+                        <longitudinal_section_columns>
+                            <dc:attribute name="description" value="${river} ${a_creation}"/>
+                            <dc:elements>
+                              <dc:element name="${facet_name}">
+                                <dc:attribute name="description" value="${facet_description}"/>
+                                <dc:attribute name="num" value="${facet_num}"/>
+                                <dc:attribute name="factory" value="TODO"/>
+                                <dc:attribute name="artifact-id" value="${a_gid}"/>
+                              </dc:element>
+                            </dc:elements>
+                        </longitudinal_section_columns>
                       </dc:context>
-                    </dc:when>
-                  </dc:choose>
-                </dc:elements>
-              </dc:context>
+                    </dc:elements>
+                  </dc:context>
+                </dc:when>
+              </dc:choose>
             </dc:elements>
           </dc:context>
         </dc:elements>