dive4elements/gnv-client: gnv-artifacts/src/main/java/de/intevation/gnv/state/MeasurementState.java comparison

comparison gnv-artifacts/src/main/java/de/intevation/gnv/state/MeasurementState.java @ 785:e764cab8c885

Save the relation between selected measurement and the parameter it belongs to (issue210). TODO: Adapt sql statements. gnv-artifacts/trunk@867 c6561f87-3c4e-4783-a992-168aeb5c3f6f

author	Ingo Weinzierl <ingo.weinzierl@intevation.de>
date	Tue, 30 Mar 2010 14:05:22 +0000
parents	c4156275c1e1
children	a5526908f92f

comparison

equal deleted inserted replaced

-:7b81d563c8c0
+:e764cab8c885
 package de.intevation.gnv.state;
 import de.intevation.artifactdatabase.XMLUtils;
+import de.intevation.artifacts.CallContext;
 import de.intevation.artifacts.CallMeta;
 import de.intevation.gnv.artifacts.ressource.RessourceFactory;
 import de.intevation.gnv.geobackend.base.Result;
 import de.intevation.gnv.state.describedata.ExtendedKeyValueData;
 import de.intevation.gnv.state.describedata.KeyValueDescibeData;
 import de.intevation.gnv.state.describedata.NamedArrayList;
 import de.intevation.gnv.state.describedata.NamedCollection;
+import de.intevation.gnv.state.exception.StateException;
+import de.intevation.gnv.utils.InputValidator;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import org.apache.log4j.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 {
 private static Logger logger = Logger.getLogger(MeasurementState.class);
 public static final String SQL_KEY_PARAMETERID = "PARAMETERID";
+public static final String SEPARATOR = ";";
 private class ParameterMatrix {
 private final Logger logger =
 Logger.getLogger(ParameterMatrix.class);
 }
 }
 }
 private void initParameters(String[] parameter) {
-int count = parameter.length;
+for (String param: parameter) {
-for (int i = 0; i < count; i++) {
+parameters.add(param);
-parameters.add(parameter[i]);
 }
 }
 public int measurementSize() {
 if (measurements != null)
 int measurements = matrix.measurementSize();
 int parameters   = matrix.parameterSize();
 for (int i = 0; i < parameters; i++) {
 Element select = creator.create("select");
-creator.addAttr(select, "label", inputParam.getDescription(matrix.getParameter(i)));
+String param   = matrix.getParameter(i);
+creator.addAttr(select, "label", inputParam.getDescription(param));
 creator.addAttr(select, "ref", name);
 for (int j = 0; j < measurements; j++) {
 Element item  = creator.create("item");
 Element label = creator.create("label");
 }
 else {
 creator.addAttr(item, "disabled", "false");
 }
+String tmpValue = matrix.getMeasurement(j) + ";" + param;
 label.setTextContent(matrix.getMDescription(j));
-value.setTextContent(matrix.getMeasurement(j));
+value.setTextContent(tmpValue);
 item.appendChild(label);
 item.appendChild(value);
 select.appendChild(item);
 }
 matrixNode.appendChild(select);
 }
 dynamicNode.appendChild(matrixNode);
 }
+@Override
+public Document feed(
+CallContext           context,
+Collection<InputData> input,
+String                uuid)
+throws StateException
+{
+RessourceFactory resFactory = RessourceFactory.getInstance();
+Locale[] serverLocales      = resFactory.getLocales();
+Locale locale               = context.getMeta().getPreferredLocale(
+serverLocales);
+if (input == null) {
+String msg = resFactory.getRessource(
+locale,
+EXCEPTION_NO_INPUT,
+EXCEPTION_NO_INPUT);
+logger.warn(msg);
+return feedFailure(msg);
+}
+for(InputData item: input) {
+String   name         = item.getName();
+InputValue inputValue = inputValues.get(name);
+String[] tupel = extractValuesAndParams(item.getValue());
+String   type  = inputValue.getType();
+if (inputValue == null) {
+String msg = resFactory.getRessource(
+locale,
+EXCEPTION_INVALID_INPUT,
+EXCEPTION_INVALID_INPUT);
+logger.warn(msg);
+return feedFailure(msg);
+}
+if (!InputValidator.isInputValid(tupel[0], type)) {
+String msg = resFactory.getRessource(
+locale,
+EXCEPTION_INVALID_INPUT,
+EXCEPTION_INVALID_INPUT);
+logger.warn(msg);
+return feedFailure(msg);
+}
+if (inputData == null) {
+inputData = new HashMap<String, InputData>();
+}
+ExtendedInputData extended = new ExtendedInputData(
+name,
+tupel[0],
+item.getObject(),
+tupel[1]);
+if (name.equals(dataName)) {
+String[] desc = getDescriptionForInputData(extended, uuid);
+extended.setDescription(desc);
+}
+inputData.put(name, extended);
+}
+return feedSuccess();
+}
+protected String[] extractValuesAndParams(String tmp) {
+String[] array = tmp.split(DefaultInputData.VALUE_SEPARATOR);
+String[] extracted = new String[2];
+for (String item: array) {
+String[] tupel = item.split(ExtendedInputData.SEPARATOR);
+if (extracted[0] == null) {
+extracted[0] = tupel[0];
+}
+else {
+extracted[0] +=
+DefaultInputData.VALUE_SEPARATOR + tupel[0];
+}
+if (extracted[1] == null) {
+extracted[1] = tupel[1];
+}
+else {
+extracted[1] += DefaultInputData.VALUE_SEPARATOR + tupel[1];
+}
+}
+logger.debug("VALUES RESULT: " + extracted[0]);
+logger.debug("PARAMS RESULT: " + extracted[1]);
+return extracted;
+}
 }
-// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8:
+// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :

Mercurial > dive4elements > gnv-client

comparison gnv-artifacts/src/main/java/de/intevation/gnv/state/MeasurementState.java @ 785:e764cab8c885