[Dive4elements-commits] [PATCH] Parsers: do not call warnings error

Wald Commits scm-commit at wald.intevation.org
Thu Mar 28 10:06:47 CET 2013


# HG changeset patch
# User Tom Gottfried <tom.gottfried at intevation.de>
# Date 1364461604 -3600
# Node ID b3dd14fc13a6a37cb45f1b3817212ffe0a50aa1c
# Parent  2c6f4a3c5a25b23bb1990e5b8d2db61d65f5cbff
Parsers: do not call warnings error

diff -r 2c6f4a3c5a25 -r b3dd14fc13a6 flys-backend/src/main/java/de/intevation/flys/importer/parsers/BedHeightEpochParser.java
--- a/flys-backend/src/main/java/de/intevation/flys/importer/parsers/BedHeightEpochParser.java	Thu Mar 28 09:39:01 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/parsers/BedHeightEpochParser.java	Thu Mar 28 10:06:44 2013 +0100
@@ -45,7 +45,7 @@
             km = new BigDecimal(nf.parse(values[0]).doubleValue());
         }
         catch (ParseException e) {
-            log.warn("Error while parsing number from data row: " + line);
+            log.warn("Unparseable number in data row: " + line);
             return;
         }
 
@@ -70,7 +70,7 @@
             obj.addValue(value);
         }
         catch (ParseException e) {
-            log.warn("Error while parsing number from data row: " + line);
+            log.warn("Unparseable number in data row: " + line);
         }
     }
 }
diff -r 2c6f4a3c5a25 -r b3dd14fc13a6 flys-backend/src/main/java/de/intevation/flys/importer/parsers/BedHeightSingleParser.java
--- a/flys-backend/src/main/java/de/intevation/flys/importer/parsers/BedHeightSingleParser.java	Thu Mar 28 09:39:01 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/parsers/BedHeightSingleParser.java	Thu Mar 28 10:06:44 2013 +0100
@@ -82,7 +82,7 @@
             obj.addValue(value);
         }
         catch (ParseException e) {
-            log.warn("BSP: Error while parsing data row.", e);
+            log.warn("BSP: unparseable value in data row.", e);
         }
     }
     
@@ -94,7 +94,7 @@
         }
         catch (NumberFormatException nfe) {
             log.warn(
-                "Error parsing " +
+                "Could not parse " +
                 value +
                 " in bed heigt single row: "
                 + line);
diff -r 2c6f4a3c5a25 -r b3dd14fc13a6 flys-backend/src/main/java/de/intevation/flys/importer/parsers/FlowVelocityMeasurementParser.java
--- a/flys-backend/src/main/java/de/intevation/flys/importer/parsers/FlowVelocityMeasurementParser.java	Thu Mar 28 09:39:01 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/parsers/FlowVelocityMeasurementParser.java	Thu Mar 28 10:06:44 2013 +0100
@@ -96,7 +96,7 @@
             ));
         }
         catch (ParseException pe) {
-            log.warn("Error while parsing flow velocity values.", pe);
+            log.warn("Unparseable flow velocity values:", pe);
         }
     }
 }
diff -r 2c6f4a3c5a25 -r b3dd14fc13a6 flys-backend/src/main/java/de/intevation/flys/importer/parsers/FlowVelocityModelParser.java
--- a/flys-backend/src/main/java/de/intevation/flys/importer/parsers/FlowVelocityModelParser.java	Thu Mar 28 09:39:01 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/parsers/FlowVelocityModelParser.java	Thu Mar 28 10:06:44 2013 +0100
@@ -200,7 +200,7 @@
                     new BigDecimal(nf.parse(qStr).doubleValue()) };
             }
             catch (ParseException pe) {
-                log.warn("Error while parsing Q value: '" + qStr + "'");
+                log.warn("Could not parse Q value: '" + qStr + "'");
             }
         }
 
@@ -232,7 +232,7 @@
             ));
         }
         catch (ParseException pe) {
-            log.warn("Error while parsing flow velocity values.", pe);
+            log.warn("Unparseable flow velocity values:", pe);
         }
     }
 }
diff -r 2c6f4a3c5a25 -r b3dd14fc13a6 flys-backend/src/main/java/de/intevation/flys/importer/parsers/MorphologicalWidthParser.java
--- a/flys-backend/src/main/java/de/intevation/flys/importer/parsers/MorphologicalWidthParser.java	Thu Mar 28 09:39:01 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/parsers/MorphologicalWidthParser.java	Thu Mar 28 10:06:44 2013 +0100
@@ -108,7 +108,7 @@
             ));
         }
         catch (ParseException pe) {
-            log.warn("MWP: Error while parsing numbers in '" + line + "'");
+            log.warn("MWP: unparseable number in data row: " + line);
         }
     }
 
diff -r 2c6f4a3c5a25 -r b3dd14fc13a6 flys-backend/src/main/java/de/intevation/flys/importer/parsers/SedimentDensityParser.java
--- a/flys-backend/src/main/java/de/intevation/flys/importer/parsers/SedimentDensityParser.java	Thu Mar 28 09:39:01 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/parsers/SedimentDensityParser.java	Thu Mar 28 10:06:44 2013 +0100
@@ -126,7 +126,7 @@
                 return true;
             }
             catch (ParseException pe) {
-                log.warn("Error while parsing numbers in: '" + line + "'");
+                log.warn("Unparseable numbers in: '" + line + "'");
             }
         }
         else {
@@ -153,7 +153,7 @@
 
         }
         catch (ParseException pe) {
-            log.warn("Error while parsing numbers in '" + line + "'");
+            log.warn("Unparseable numbers in '" + line + "'");
             return;
         }
 
@@ -170,7 +170,7 @@
                 year = new BigDecimal(c.get(Calendar.YEAR));
             }
             catch (IllegalArgumentException iae) {
-                log.warn("Error while parsing date in '" + line + "'");
+                log.warn("Could not parse date in '" + line + "'");
                 return;
             }
         }
diff -r 2c6f4a3c5a25 -r b3dd14fc13a6 flys-backend/src/main/java/de/intevation/flys/importer/parsers/SedimentYieldParser.java
--- a/flys-backend/src/main/java/de/intevation/flys/importer/parsers/SedimentYieldParser.java	Thu Mar 28 09:39:01 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/parsers/SedimentYieldParser.java	Thu Mar 28 10:06:44 2013 +0100
@@ -228,7 +228,7 @@
             }
         }
         catch (ParseException pe) {
-            log.warn("SYP: Error while parsing numbers in '" + line + "':", pe);
+            log.warn("SYP: unparseable number in data row '" + line + "':", pe);
         }
     }
 
@@ -269,7 +269,7 @@
             log.warn("SYP: Unknown time interval string: '" + column + "'");
         }
         catch (ParseException pe) {
-            log.warn("SYP: Error while parsing years: " + column, pe);
+            log.warn("SYP: Could not parse years: " + column, pe);
         }
 
         return null;
@@ -296,7 +296,7 @@
                 );
             }
             catch (ParseException pe) {
-                log.warn("SYP: Error while parsing ranges of: '" + gfStr + "'");
+                log.warn("SYP: Could not parse ranges of: '" + gfStr + "'");
             }
         }
 
@@ -318,7 +318,7 @@
                 );
             }
             catch (ParseException pe) {
-                log.warn("SYP: Error while parsing ranges of: '" + gfStr + "'");
+                log.warn("SYP: Could not parse ranges of: '" + gfStr + "'");
             }
         }
 
@@ -346,7 +346,7 @@
                 }
             }
             catch (ParseException pe) {
-                log.warn("SYP: Error while parsing ranges of: '" + gfStr + "'");
+                log.warn("SYP: Could not parse ranges of: '" + gfStr + "'");    
             }
         }
 
diff -r 2c6f4a3c5a25 -r b3dd14fc13a6 flys-backend/src/main/java/de/intevation/flys/importer/parsers/WaterlevelDifferencesParser.java
--- a/flys-backend/src/main/java/de/intevation/flys/importer/parsers/WaterlevelDifferencesParser.java	Thu Mar 28 09:39:01 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/parsers/WaterlevelDifferencesParser.java	Thu Mar 28 10:06:44 2013 +0100
@@ -185,12 +185,12 @@
                         new BigDecimal(nf.parse(value).doubleValue()));
                 }
                 catch (ParseException pe) {
-                    log.warn("Error while parsing value: '" + value + "'");
+                    log.warn("Could not parse value: '" + value + "'");
                 }
             }
         }
         catch (ParseException pe) {
-            log.warn("Error while parsing station: '" + line + "'");
+            log.warn("Could not parse station: '" + line + "'");
         }
     }
 }
diff -r 2c6f4a3c5a25 -r b3dd14fc13a6 flys-backend/src/main/java/de/intevation/flys/importer/parsers/WaterlevelParser.java
--- a/flys-backend/src/main/java/de/intevation/flys/importer/parsers/WaterlevelParser.java	Thu Mar 28 09:39:01 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/parsers/WaterlevelParser.java	Thu Mar 28 10:06:44 2013 +0100
@@ -154,7 +154,7 @@
                 return true;
             }
             catch (ParseException pe) {
-                log.warn("Error while parsing Q range: '" + line + "'");
+                log.warn("Unparseable Q range: '" + line + "'");
             }
         }
 
@@ -184,7 +184,7 @@
             }
         }
         catch (ParseException pe) {
-            log.warn("Error while parsing number values: '" + line + "'");
+            log.warn("Unparseable number in data row: " + line);
         }
     }
 }


More information about the Dive4elements-commits mailing list