# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1320413355 0
# Node ID 35e38e2afb22a3ec18a7518dc4970fb7622bd2cc
# Parent  9eedda250280ebb61a7879713ab8fe0631d6c42a
Re-enabled mainvalue-recommendation for computed discharge curves.

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

diff -r 9eedda250280 -r 35e38e2afb22 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Fri Nov 04 13:23:39 2011 +0000
+++ b/flys-artifacts/ChangeLog	Fri Nov 04 13:29:15 2011 +0000
@@ -1,3 +1,18 @@
+2011-11-04  Felix Wolfsteller <felix.wolfsteller@intevation.de>
+
+	Re-enable mainvalue-recommendations for computed discharge curves,
+	as the NPE should be gone.
+
+	* doc/conf/meta-data.xml: Uncomment mainvalue recommendations.
+
+2011-11-04  Felix Wolfsteller <felix.wolfsteller@intevation.de>
+
+	When querying metadata/datacage, use only output-names of outputs that
+	actually exists (in the sense of having facets).
+
+	* src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java:
+	  Get output names from artifact, not from state.
+
 2011-11-04  Ingo Weinzierl <ingo@intevation.de>
 
 	* doc/conf/meta-data.xml: Removed DEMs from floodmap configuration,
@@ -20,14 +35,6 @@
 
 2011-11-04  Felix Wolfsteller <felix.wolfsteller@intevation.de>
 
-	When querying metadata/datacage, use only output-names of outputs that
-	actually exists (in the sense of having facets).
-
-	* src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java:
-	  Get output names from artifact, not from state.
-
-2011-11-04  Felix Wolfsteller <felix.wolfsteller@intevation.de>
-
 	For a Flys-Collection, add outputt to attributes-part of describe
 	document only if they contain facets.  -> Prevent empty output nodes
 	in flys-collections outputs.
diff -r 9eedda250280 -r 35e38e2afb22 flys-artifacts/doc/conf/meta-data.xml
--- a/flys-artifacts/doc/conf/meta-data.xml	Fri Nov 04 13:23:39 2011 +0000
+++ b/flys-artifacts/doc/conf/meta-data.xml	Fri Nov 04 13:29:15 2011 +0000
@@ -428,10 +428,10 @@
           </dc:if>
           <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')">
               <computed-discharge-curve>
-                <!--mainvalue>
+                <mainvalue>
                   <dc:attribute name="factory" value="mainvalue"/>
-                  <dc:attribute name="db-ids"  value="${river_id}"/>
-                </mainvalue-->
+                  <dc:attribute name="ids"  value="${river_id}"/>
+                </mainvalue>
               </computed-discharge-curve>
           </dc:if>
           <dc:if test="dc:contains($artifact-outs, 'longitudinal_section')">