diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/BedDifferencesAccess.java @ 3898:95d699c769fb

Bedheight difference calculation has chart outpus now. flys-artifacts/trunk@5562 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Raimund Renkert <raimund.renkert@intevation.de>
date Fri, 21 Sep 2012 14:29:32 +0000
parents a1c79d84e3cd
children cbd0fafcb26b
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/BedDifferencesAccess.java	Fri Sep 21 14:18:16 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/BedDifferencesAccess.java	Fri Sep 21 14:29:32 2012 +0000
@@ -1,8 +1,11 @@
 package de.intevation.flys.artifacts.access;
 
+import java.util.Arrays;
+
+import org.apache.log4j.Logger;
+
 import de.intevation.artifacts.CallContext;
 import de.intevation.flys.artifacts.FLYSArtifact;
-import de.intevation.flys.artifacts.model.minfo.BedHeight;
 import de.intevation.flys.utils.FLYSUtils;
 import de.intevation.flys.utils.StringUtil;
 
@@ -10,7 +13,7 @@
 public class BedDifferencesAccess
 extends RiverAccess
 {
-
+    private static Logger logger = Logger.getLogger(BedDifferencesAccess.class);
     private String yearEpoch;
     private String[] diffs;
 
@@ -22,19 +25,22 @@
     }
 
     public String getYearEpoch() {
+        yearEpoch = getString("ye_select");
         return yearEpoch;
     }
 
     public FLYSArtifact[][] getDifferenceArtifacts() {
-        FLYSArtifact[][] artifacts = new FLYSArtifact[diffs.length][2];
-        for (int i = 0; i < diffs.length; i++) {
-            String[] diff = diffs[i].split("#");
-            String diff1 = StringUtil.unbracket(diff[0]);
-            String diff2 = StringUtil.unbracket(diff[1]);
+        diffs = getString("diffids").split("#");
+        logger.debug("diffs: " + Arrays.toString(diffs));
+        FLYSArtifact[][] artifacts = new FLYSArtifact[diffs.length/2][2];
+        for (int i = 0; i < diffs.length; i += 2) {
+            String diff1 = StringUtil.unbracket(diffs[0 + 2*i]);
+            String diff2 = StringUtil.unbracket(diffs[1 + 2*i]);
             String[] diff1parts = diff1.split(";");
             String[] diff2parts = diff2.split(";");
+            logger.debug("creating 2 artifacts." + diff1parts[0] + "; " + diff2parts[0]);
             artifacts[i][0] = FLYSUtils.getArtifact(diff1parts[0], context);
-            artifacts[i][1] = FLYSUtils.getArtifact(diff2parts[1], context);
+            artifacts[i][1] = FLYSUtils.getArtifact(diff2parts[0], context);
         }
         return artifacts;
     }

http://dive4elements.wald.intevation.org