[Dive4elements-commits] [PATCH 2 of 2] merge

[Wald Commits]

# HG changeset patch
# User Tom Gottfried <tom.gottfried at intevation.de>
# Date 1366974803 -7200
# Node ID 8c777c04402536b5b4232087d9c0fbf35361c981
# Parent  d5e95f926d13efb8891623a644e5acf2b33bc1c9
# Parent  df5d29987df80d4e71cec38ab34b05a0fdfd1d4b
merge

diff -r d5e95f926d13 -r 8c777c044025 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Fri Apr 26 13:12:29 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Fri Apr 26 13:13:23 2013 +0200
@@ -251,7 +251,7 @@
                       <dc:for-each>
                         <column name="{$prot_column_name}"
                                 ids="fixations-wstv-{$prot_rel_pos}-{$prot_id}"
-                                factory="staticwkms"
+                                factory="staticwqkms"
                                 info="{$info} [km {$deffrom} - {$defto}]"/>
                       </dc:for-each>
                     </dc:context>
diff -r d5e95f926d13 -r 8c777c044025 artifacts/doc/conf/themes.xml
--- a/artifacts/doc/conf/themes.xml	Fri Apr 26 13:12:29 2013 +0200
+++ b/artifacts/doc/conf/themes.xml	Fri Apr 26 13:13:23 2013 +0200
@@ -336,6 +336,7 @@
         <mapping from="fix_derivate_curve" to="FixingDerivedCurve" />
         <mapping from="fix_derivate_curve.manualpoints" to="ManualPoints" />
         <mapping from="fix_deltawt_curve.manualpoints" to="ManualPoints" />
+        <mapping from="fix_events_wqkms" to="FixPoints" />
         <mapping from="qsectors" to="QSectors" />
         <mapping from="gauge_discharge_curve" to="GaugeDischargeCurve" />
         <mapping from="extreme_wq_curve" to="ExtremeWQCurve" />
diff -r d5e95f926d13 -r 8c777c044025 artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java	Fri Apr 26 13:12:29 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java	Fri Apr 26 13:13:23 2013 +0200
@@ -87,7 +87,8 @@
         LONGITUDINAL_Q,
         DURATION_Q,
         HISTORICAL_DISCHARGE_MAINVALUES_W,
-        HISTORICAL_DISCHARGE_MAINVALUES_Q
+        HISTORICAL_DISCHARGE_MAINVALUES_Q,
+        STATIC_WQKMS_Q
     };
 
     static {
diff -r d5e95f926d13 -r 8c777c044025 artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixRealizingCompute.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixRealizingCompute.java	Fri Apr 26 13:12:29 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixRealizingCompute.java	Fri Apr 26 13:13:23 2013 +0200
@@ -155,10 +155,13 @@
             FIX_REFERENCE_EVENTS_WQ,
             Resources.getMsg(meta, I18N_WQ_EVENTS, I18N_WQ_EVENTS)));
 
-        facets.add(new FixOutlierFacet(
-            0,
-            FIX_OUTLIER,
-            Resources.getMsg(meta, I18N_WQ_OUTLIER, I18N_WQ_OUTLIER)));
+
+        if (access.getPreprocessing()) {
+            facets.add(new FixOutlierFacet(
+                0,
+                FIX_OUTLIER,
+                Resources.getMsg(meta, I18N_WQ_OUTLIER, I18N_WQ_OUTLIER)));
+        }
 
         return res;
     }
diff -r d5e95f926d13 -r 8c777c044025 backend/src/main/java/org/dive4elements/river/model/Wst.java
--- a/backend/src/main/java/org/dive4elements/river/model/Wst.java	Fri Apr 26 13:12:29 2013 +0200
+++ b/backend/src/main/java/org/dive4elements/river/model/Wst.java	Fri Apr 26 13:13:23 2013 +0200
@@ -185,6 +185,11 @@
             return null;
         }
 
+        if (results.get(0)[0] == null || results.get(0)[1] == null) {
+            logger.warn("Could not process result from min/maxQ query.");
+            return null;
+        }
+
         Object [] result = results.get(0);
 
         return new double [] {