# HG changeset patch
# User Raimund Renkert <rrenkert@intevation.de>
# Date 1377851490 -7200
# Node ID 976f4e4df363212b36710355391d61f5bc9d59c9
# Parent  aee36709a8e8c34b0da8473394aa349d4656b61d
Validate haputprobennummer on probe update and create.

diff -r aee36709a8e8 -r 976f4e4df363 src/main/java/de/intevation/lada/validation/LProbeValidator.java
--- a/src/main/java/de/intevation/lada/validation/LProbeValidator.java	Fri Aug 30 10:30:28 2013 +0200
+++ b/src/main/java/de/intevation/lada/validation/LProbeValidator.java	Fri Aug 30 10:31:30 2013 +0200
@@ -9,11 +9,14 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
+import com.sun.istack.Builder;
+
 import de.intevation.lada.data.LOrtRepository;
 import de.intevation.lada.data.LProbeRepository;
 import de.intevation.lada.data.QueryBuilder;
 import de.intevation.lada.model.LOrt;
 import de.intevation.lada.model.LProbe;
+import de.intevation.lada.model.LProbeInfo;
 import de.intevation.lada.rest.Response;
 
 /**
@@ -57,9 +60,7 @@
         validateEntnahmeOrt(p, warnings);
         validateProbenahmeBegin(p, warnings);
         validateUWB(p, warnings);
-        if (!update) {
-            validateHauptProbenNummer(p, warnings);
-        }
+        validateHauptProbenNummer(p, warnings);
         return warnings;
     }
 
@@ -72,6 +73,15 @@
      */
     private void validateHauptProbenNummer(LProbe p, Map<String, Integer> warnings)
     throws ValidationException {
+        Response pInfo =
+            probeRepository.findById(LProbeInfo.class, p.getProbeId());
+        List<LProbeInfo> pList = (List<LProbeInfo>)pInfo.getData();
+        if (!(pList == null) && !pList.isEmpty()) {
+            LProbeInfo probe = pList.get(0);
+            if (probe.getHauptprobenNr().equals(p.getHauptprobenNr())) {
+                return;
+            }
+        }
         String hpn = p.getHauptprobenNr();
         QueryBuilder<LProbe> builder =
             new QueryBuilder<LProbe>(