# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1313679497 0
# Node ID ba840385ad2eb1cd900ca28481f70ec8acdbf914
# Parent  a007a4368768a473c247855de3c4e654763588db
flys/issue260: Datacage uses master_artifacts view now.

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

diff -r a007a4368768 -r ba840385ad2e flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Thu Aug 18 14:19:30 2011 +0000
+++ b/flys-artifacts/ChangeLog	Thu Aug 18 14:58:17 2011 +0000
@@ -1,3 +1,9 @@
+2011-08-18  Sascha L. Teichmann <sascha.teichmann@intevation.de>
+
+	Fixed flys/issue260
+
+	* doc/conf/meta-data-user.xml: Uses master_artifacts view now.
+
 2011-08-18  Sascha L. Teichmann <sascha.teichmann@intevation.de>
 
 	* doc/conf/datacage.sql: Added view master_artifacts to select
diff -r a007a4368768 -r ba840385ad2e flys-artifacts/doc/conf/meta-data-user.xml
--- a/flys-artifacts/doc/conf/meta-data-user.xml	Thu Aug 18 14:19:30 2011 +0000
+++ b/flys-artifacts/doc/conf/meta-data-user.xml	Thu Aug 18 14:58:17 2011 +0000
@@ -15,12 +15,12 @@
         </dc:statement>
         <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.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>SELECT id AS a_id, state AS a_state, gid AS a_gid, creation AS a_creation
+                          FROM   master_artifacts m
+                          WHERE  collection_id = ${collection_id} AND gid &lt;&gt; CAST(${artifact-id} AS uuid)
+                                 AND EXISTS (
+                                    SELECT id FROM artifact_data WHERE artifact_id = m.id AND k = 'river' AND v = ${river})
             </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'">