[PATCH] SQ relation: only take sieve which have values at all

[Wald Commits]

# HG changeset patch
# User Sascha L. Teichmann <teichmann at intevation.de>
# Date 1387299577 -3600
# Node ID a877d2680a4a3c9ddd0a898d613e641093b47445
# Parent  5484818087de311c53a23fd268197ff8d0ddbbf1
SQ relation: only take sieve which have values at all.

diff -r 5484818087de -r a877d2680a4a artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/Measurement.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/Measurement.java	Tue Dec 17 17:21:37 2013 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/Measurement.java	Tue Dec 17 17:59:37 2013 +0100
@@ -190,8 +190,11 @@
         sieveArray.adjust(
             eightValue/sieveArray.totalLoad(),
             newFourValue/sieveArray.totalLoad());
-        log.debug("Adjusted loads: " + Arrays.toString(sieveArray.getLoads()));
-        log.debug("Adjusted norm loads:" + Arrays.toString(sieveArray.getNormLoads()));
+
+        if (log.isDebugEnabled()) {
+            log.debug("Adjusted loads: " + Arrays.toString(sieveArray.getLoads()));
+            log.debug("Adjusted norm loads:" + Arrays.toString(sieveArray.getNormLoads()));
+        }
     }
 
     protected SieveArray calculateSieveArray() {
diff -r 5484818087de -r a877d2680a4a artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/MeasurementFactory.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/MeasurementFactory.java	Tue Dec 17 17:21:37 2013 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/MeasurementFactory.java	Tue Dec 17 17:59:37 2013 +0100
@@ -116,7 +116,7 @@
                 "COALESCE(gs.RSIEB15, 0) + COALESCE(gs.RSIEB16, 0) +" +
                 "COALESCE(gs.RSIEB17, 0) + COALESCE(gs.RSIEB18, 0) +" +
                 "COALESCE(gs.RSIEB19, 0) + COALESCE(gs.RSIEB20, 0) +" +
-                "COALESCE(gs.RSIEB21, 0) + COALESCE(gs.REST, 0)) >= 0 " +
+                "COALESCE(gs.RSIEB21, 0) + COALESCE(gs.REST, 0)) > 0 " +
         "ORDER BY " +
             "m.DATUM, g.UFERABST, g.GLOTRECHTEID, gp.LFDNR";
 
@@ -154,7 +154,7 @@
             }
             rawWriter.writeNext(nextLine);
         }
-    }
+    } // class CSVTransformer
 
     public static class FractionsTransformer extends CSVTransformer {