[Lada-commits] [PATCH] Move auto-setting 'fertig' to correct block

[Wald Commits]

# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1455535891 -3600
# Node ID 305f138982eb788a039e39ca577afbc532180f90
# Parent  72df22ada23ad808474fcae2bcd8042e803652f8
Move auto-setting 'fertig' to correct block.

diff -r 72df22ada23a -r 305f138982eb src/main/java/de/intevation/lada/rest/StatusService.java
--- a/src/main/java/de/intevation/lada/rest/StatusService.java	Mon Feb 15 12:19:36 2016 +0100
+++ b/src/main/java/de/intevation/lada/rest/StatusService.java	Mon Feb 15 12:31:31 2016 +0100
@@ -312,14 +312,14 @@
                 else {
                     return new Response(false, 699, null);
                 }
+            }
 
-                // auto-set 'fertig'-flag
-                if (status.getStatusStufe() == 1) {
-                    messung.setFertig(true);
-                }
-                else if (status.getStatusWert() == 4) {
-                    messung.setFertig(false);
-                }
+            // auto-set 'fertig'-flag
+            if (status.getStatusStufe() == 1) {
+                messung.setFertig(true);
+            }
+            else if (status.getStatusWert() == 4) {
+                messung.setFertig(false);
             }
         }
         Violation violation = validator.validate(status);
diff -r 72df22ada23a -r 305f138982eb src/main/java/de/intevation/lada/validation/rules/messung/MessgroesseToMessmethode.java
--- a/src/main/java/de/intevation/lada/validation/rules/messung/MessgroesseToMessmethode.java	Mon Feb 15 12:19:36 2016 +0100
+++ b/src/main/java/de/intevation/lada/validation/rules/messung/MessgroesseToMessmethode.java	Mon Feb 15 12:31:31 2016 +0100
@@ -74,7 +74,9 @@
         for(LMesswert messwert: messwerte) {
             boolean hit = false;
             for (MmtMessgroesse messgroesse: found) {
-                logger.debug("###### mmt: " + messwert.getMessgroesseId() + " mmtmg: " + messgroesse.getMmtMessgroessePK().getMessgroessengruppeId());
+                logger.trace("###### mmt: " + messwert.getMessgroesseId()
+                    + " mmtmg: " + messgroesse.getMmtMessgroessePK()
+                    .getMessgroessengruppeId());
                 if (messwert.getMessgroesseId().equals(
                         messgroesse.getMmtMessgroessePK().getMessgroessengruppeId())) {
                     hit = true;
diff -r 72df22ada23a -r 305f138982eb src/main/webapp/WEB-INF/classes/log4j.properties
--- a/src/main/webapp/WEB-INF/classes/log4j.properties	Mon Feb 15 12:19:36 2016 +0100
+++ b/src/main/webapp/WEB-INF/classes/log4j.properties	Mon Feb 15 12:31:31 2016 +0100
@@ -3,8 +3,8 @@
 log4j.logger.org.openid4java=WARN
 log4j.logger.org.hibernate=ERROR
 log4j.appender.lada=org.apache.log4j.RollingFileAppender
-log4j.appender.lada.File=/var/log/wildfly/lada-server.log
-log4j.appender.lada.MaxFileSize=1MB
+log4j.appender.lada.File=/usr/src/lada-server/log/lada-server.log
+log4j.appender.lada.MaxFileSize=20MB
 log4j.appender.lada.MaxBackupIndex=5
 log4j.appender.lada.layout=org.apache.log4j.PatternLayout
-log4j.appender.lada.layout.ConversionPattern=%d %p %l: %m%n
+log4j.appender.lada.layout.ConversionPattern=%d{HH:mm:ss,sss}: %-5p %c{1} - %m%n