Merge pull request #320 from dtcenter/issue/319-date_xml_parser

The loading module produses an error when parsing <date_list> elemen…
dtcenter · Aug 13, 2021 · be29053 · be29053
2 parents 27fc3dc + f552b5e
commit be29053
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/java/edu/ucar/metviewer/MVUtil.java b/java/edu/ucar/metviewer/MVUtil.java
@@ -937,21 +937,16 @@ public static List<String> buildDateList(final MVNode node, final PrintStream pr
    * @param date   (optional) String representation of the date from which to offset
    * @return String representation of the offset date
    */
-  public static String parseDateOffset(final MVNode node, final String format, final String date)
-          throws ValidationException {
+  public static String parseDateOffset(final MVNode node, final String format, final String date) {
     int intOffset = 0;
     int intHour = 0;
 
     for (int i = 0; i < node.children.length; i++) {
       MVNode nodeChild = node.children[i];
-      try {
-        if (nodeChild.tag.equals("day_offset")) {
-          intOffset = Integer.parseInt(nodeChild.value);
-        } else if (nodeChild.tag.equals("hour")) {
-          intHour = Integer.parseInt(nodeChild.value);
-        }
-      } catch (NumberFormatException e) {
-        throw new ValidationException("day_offset or hour is invalid");
+      if (nodeChild.tag.equals("day_offset")) {
+        intOffset = Integer.parseInt(nodeChild.value);
+      } else if (nodeChild.tag.equals("hour")) {
+        intHour = Integer.parseInt(nodeChild.value);
       }
     }
 
@@ -960,8 +955,7 @@ public static String parseDateOffset(final MVNode node, final String format, fin
     Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
     try {
       cal.setTime(formatOffset.parse(date));
-    } catch (ParseException e) {
-      throw new ValidationException("date" + date + " is invalid");
+    } catch (Exception e) {
     }
     cal.set(Calendar.HOUR_OF_DAY, intHour);
     cal.set(Calendar.MINUTE, 0);