Merge pull request #2211 from theoweiss/influxdb-2015-2

Influxdb bugfix for issue #2208 (restoring switch or contact state)
openhab · Mar 3, 2015 · b6f8e8a · b6f8e8a
2 parents 777ab73 + 977b29a
commit b6f8e8a
Showing 1 changed file with 24 additions and 2 deletions.
diff --git a/...e.influxdb/java/org/openhab/persistence/influxdb/internal/InfluxDBPersistenceService.java b/...e.influxdb/java/org/openhab/persistence/influxdb/internal/InfluxDBPersistenceService.java
@@ -473,9 +473,13 @@ private State objectToState(Object value, String itemName) {
       try {
         Item item = itemRegistry.getItem(itemName);
         if (item instanceof SwitchItem && !(item instanceof DimmerItem)) {
-          return valueStr.equals(DIGITAL_VALUE_OFF) ? OnOffType.OFF : OnOffType.ON;
+          return string2DigitalValue(valueStr).equals(DIGITAL_VALUE_OFF)
+              ? OnOffType.OFF
+              : OnOffType.ON;
         } else if (item instanceof ContactItem) {
-          return valueStr.equals(DIGITAL_VALUE_OFF) ? OpenClosedType.CLOSED : OpenClosedType.OPEN;
+          return string2DigitalValue(valueStr).equals(DIGITAL_VALUE_OFF)
+              ? OpenClosedType.CLOSED
+              : OpenClosedType.OPEN;
         }
       } catch (ItemNotFoundException e) {
         logger.warn("Could not find item '{}' in registry", itemName);
@@ -485,4 +489,22 @@ private State objectToState(Object value, String itemName) {
     return new DecimalType(valueStr);
   }
 
+  /**
+   * Maps a string value which expresses a {@link BigDecimal.ZERO } to DIGITAL_VALUE_OFF, all others
+   * to DIGITAL_VALUE_ON
+   * 
+   * @param value to be mapped
+   * @return
+   */
+  private String string2DigitalValue(String value) {
+    BigDecimal num = new BigDecimal(value);
+    if (num.compareTo(BigDecimal.ZERO) == 0) {
+      logger.trace("digitalvalue {}", DIGITAL_VALUE_OFF);
+      return DIGITAL_VALUE_OFF;
+    } else {
+      logger.trace("digitalvalue {}", DIGITAL_VALUE_ON);
+      return DIGITAL_VALUE_ON;
+    }
+  }
+
 }