Changeset 2532

Timestamp:

Jun 26, 2014, 4:27:52 PM (9 years ago)

Author:

olle

Message:

Refs #607. Lab environment extension configuration file updated to accept lab sensor start date both in YYYYMMDD and YYYY-MM-DD format, and alarm start and end times in HHMM, HH:MM, HHMMSS, and HH:MM:SS formats:

1. Class/file LabEnvironmentConfiguration.java in src/net/sf/basedb/labenv/ updated:
   a. Private method void fetchConfiguration() updated to call new private convenience method String convertToDateStringWithHyphens(String dateStr) to convert input sensor start date to format YYYY-MM-DD.
   b. Private method List<LabSensorAlarmConfig> fetchLabSensorAlarmList(Element labSensorTag, Namespace ns) updated to call new private convenience method String convertToTimeStringInFormatHHMM(String timeStr) to convert input alarm start and end times to HHMM format.
   c. New private convenience method String convertToDateStringWithHyphens(String dateStr) added. It converts input date string from format YYYYMMDD to YYYY-MM-DD, if necessary.
   d. New private convenience method String convertToTimeStringInFormatHHMM(String timeStr) added. It converts input time string from formats HHMMSS, HH:MM:SS, and HH:MM to HHMM, if necessary. If input time contains seconds, the latter will be dropped, i.e. the minute entry will not be incremented if the number of seconds >= 30.

File:

• extensions/net.sf.basedb.labenv/trunk/src/net/sf/basedb/labenv/LabEnvironmentConfiguration.java (modified) (4 diffs)

extensions/net.sf.basedb.labenv/trunk/src/net/sf/basedb/labenv/LabEnvironmentConfiguration.java

@@ -274 +274 @@
                     String nameConf = Values.getStringOrNull(labSensorTag.getChildText("name", ns));
                     String startDateConf = Values.getStringOrNull(labSensorTag.getChildText("startdate", ns));
+                    startDateConf = convertToDateStringWithHyphens(startDateConf);
                     List<LabSensorAlarmConfig> alarmList = fetchLabSensorAlarmList(labSensorTag, ns);
                     log.debug("numberConf = " + numberConf + " urlConf = " + urlConf + " nameConf = \"" + nameConf + "\" startDateConf = " + startDateConf);
@@ -327 +328 @@
   }
 
+
   @SuppressWarnings("unchecked")
   private List<LabSensorAlarmConfig> fetchLabSensorAlarmList(Element labSensorTag, Namespace ns)
@@ -343 +345 @@
             {
                 String startTimeConf = Values.getStringOrNull(alarmTag.getChildText("starttime", ns));
+                startTimeConf = convertToTimeStringInFormatHHMM(startTimeConf);
                 String endTimeConf = Values.getStringOrNull(alarmTag.getChildText("endtime", ns));
+                endTimeConf = convertToTimeStringInFormatHHMM(endTimeConf);
                 String weekdayFilterConf = Values.getStringOrNull(alarmTag.getChildText("weekdayfilter", ns));
                 Double temperatureMinConf = Values.getDouble(alarmTag.getChildText("temperaturemin", ns), null);
@@ -480 +484 @@
   }
 
+
+  /**
+   * Converts input date string from format YYYYMMDD to YYYY-MM-DD,
+   * if necessary.
+   * 
+   * @param dateStr String Input date string
+   * @return String Date string in YYYY-MM-DD format if input in YYYYMMDD, otherwise no change
+   */
+  String convertToDateStringWithHyphens(String dateStr)
+  {
+    String outDateStr = dateStr;
+    if (dateStr != null)
+    {
+      if (dateStr.length() == 8)
+      {
+        // Expected format: YYYYMMDD
+        String yearStr = dateStr.substring(0, 4);
+        String monthStr = dateStr.substring(4, 6);
+        String dayStr = dateStr.substring(6, 8);
+        outDateStr = yearStr + "-" + monthStr + "-" + dayStr;
+      }
+    }
+    return outDateStr;
+  }
+
+  /**
+   * Converts input time string from formats HHMMSS, HH:MM:SS, and HH:MM to HHMM,
+   * if necessary. If input time contains seconds, the latter will be dropped,
+   * i.e. the minute entry will not be incremented if the number of seconds >= 30.
+   * If input time string is null or an empty string, no change.
+   * 
+   * @param timeStr String Input time string
+   * @return String Time string in HHMM format
+   */
+  String convertToTimeStringInFormatHHMM(String timeStr)
+  {
+    String outTimeStr = timeStr;
+    if (timeStr != null)
+    {
+      if (timeStr.length() == 8)
+      {
+        // Expected format: HH:MM:SS
+        String hourStr = timeStr.substring(0, 2);
+        String minuteStr = timeStr.substring(3, 5);
+        outTimeStr = hourStr + minuteStr;
+      }
+      else if (timeStr.length() == 6)
+      {
+        // Expected format: HHMMSS
+        String hourStr = timeStr.substring(0, 2);
+        String minuteStr = timeStr.substring(2, 4);
+        outTimeStr = hourStr + minuteStr;
+      }
+      else if (timeStr.length() == 5)
+      {
+        // Expected format: HH:MM
+        String hourStr = timeStr.substring(0, 2);
+        String minuteStr = timeStr.substring(3, 5);
+        outTimeStr = hourStr + minuteStr;
+      }
+    }
+    return outTimeStr;
+  }
+
   private LabSensorAlarmConfig createIfNeeded(LabSensorAlarmConfig labSensorAlarmConfig)
   {