float fix 4

deployment/instances/udi-influx/default/config.json

@@ -105,6 +105,7 @@
           "devicePart": "3",
           "valueFrom": "payload",
           "valuePart": "1",
+          "valueType": "float",
           "unitFrom": "payload",
           "unitPart": "3"
         }
@@ -185,7 +186,7 @@
         "attributes": {
           "application": "Shellies Sensor Temperature",
           "deviceSelector": "T:2",
-          "valueSelector": "j:$.tC",
+          "valueSelector": "J:$.tC",
           "unitSelector": "C:°C"
         }
       }
@@ -199,7 +200,7 @@
         "attributes": {
           "application": "Shellies Sensor Humidity",
           "deviceSelector": "T:2",
-          "valueSelector": "j:$.rh",
+          "valueSelector": "J:$.rh",
           "unitSelector": "C:%"
         }
       }
@@ -213,7 +214,7 @@
         "attributes": {
           "application": "Shellies Sensor Power",
           "deviceSelector": "T:2",
-          "valueSelector": "j:$.battery.percent",
+          "valueSelector": "J:$.battery.percent",
           "unitSelector": "C:%"
         }
       }

src/udi/handlers/dt1t/dt1t.go

@@ -2,15 +2,13 @@ package dt1t
 
 import (
 	"log"
-  "fmt"
-  "time"
 	"strconv"
-  "udi/handlers/handler"
+	"time"
-  "udi/database"
 	"udi/config"
+	"udi/database"
+	"udi/handlers/handler"
 )
 
-
 type Dt1tHandler struct {
 	handler.CommonHandler
 	ready       bool
@@ -18,12 +16,10 @@ type Dt1tHandler struct {
 	dbh         *database.DatabaseHandle
 	application string
 	device      string
-
 }
 
 func New(id string, config config.HandlerConfigT) handler.Handler {
-  t := &Dt1tHandler {
+	t := &Dt1tHandler{}
-  }
 
 	if config.Attributes["Application"] == "" {
 		log.Println("Error: application not configured")
@@ -44,7 +40,7 @@ func New(id string, config config.HandlerConfigT) handler.Handler {
 }
 
 func (self *Dt1tHandler) Handle(message handler.MessageT) {
-  if ! self.ready {
+	if !self.ready {
 		self.Lost("Handler is not marked as ready", nil, message)
 		return
 	}
@@ -55,7 +51,7 @@ func (self *Dt1tHandler) Handle(message handler.MessageT) {
 		self.Lost("Invalid raw value", err, message)
 		return
 	}
-  if temperature & 0x8000 != 0{
+	if temperature&0x8000 != 0 {
 		temperature = ((temperature - 1) ^ 0xffff) * -1
 	}
 	temperatureF := float32(temperature) / 10.0
@@ -69,7 +65,7 @@ func (self *Dt1tHandler) Handle(message handler.MessageT) {
 	variable.Label = "Temperature"
 	variable.Variable = ""
 	variable.Unit = "°C"
-  variable.Value = fmt.Sprintf("%f", temperatureF)
+	variable.Value = temperatureF
 	measurement.Values = make(map[string]database.VariableType)
 	measurement.Values["Value"] = variable
 
@@ -77,5 +73,3 @@ func (self *Dt1tHandler) Handle(message handler.MessageT) {
 	self.dbh.StoreMeasurement(&measurement)
 	self.S()
 }
-
-

src/udi/handlers/prepared/prepared.go

@@ -1,15 +1,14 @@
 package prepared
 
 import (
-  "time"
-  "log"
 	"encoding/json"
+	"log"
+	"time"
 	"udi/config"
-  "udi/handlers/handler"
 	"udi/database"
+	"udi/handlers/handler"
 )
 
-
 type PreparedHandler struct {
 	handler.CommonHandler
 	dbh *database.DatabaseHandle
@@ -18,7 +17,7 @@ type PreparedHandler struct {
 type endpoint_t struct {
 	Label    string      `json:"label"`
 	Variable string      `json:"variable"`
-  Value string `json:"value"`
+	Value    interface{} `json:"value"`
 	Unit     string      `json:"unit"`
 	Status   string      `json:"status"`
 }
@@ -29,10 +28,8 @@ type observation_t struct {
 	Variables map[string]endpoint_t `json:"variables"`
 }
 
-
 func New(id string, config config.HandlerConfigT) handler.Handler {
-  t := &PreparedHandler {
+	t := &PreparedHandler{}
-  }
 	t.Id = id
 	t.dbh = database.NewDatabaseHandle()
 	log.Printf("Handler Prepared %d initialized", id)
@@ -55,13 +52,13 @@ func (self *PreparedHandler) Handle(message handler.MessageT) {
 	measurement.Application = self.Id
 	measurement.Device = observation.Device
 
-  measurement.Attributes = map[string]interface{} {
+	measurement.Attributes = map[string]interface{}{
 		"Label": observation.Label,
 	}
 
 	measurement.Values = make(map[string]database.VariableType)
 	for k, v := range observation.Variables {
-    measurement.Values[k] = database.VariableType {
+		measurement.Values[k] = database.VariableType{
 			Label:    v.Label,
 			Variable: v.Variable,
 			Unit:     v.Unit,
@@ -75,5 +72,3 @@ func (self *PreparedHandler) Handle(message handler.MessageT) {
 	self.dbh.StoreMeasurement(&measurement)
 	self.S()
 }
-
-

src/udi/handlers/svej/svej.go

@@ -46,7 +46,7 @@ func New(id string, config config.HandlerConfigT) handler.Handler {
 	t.application = config.Attributes["application"]
 
 	t.deviceSelector = config.Attributes["deviceSelector"]
-	if t.deviceSelector[:2] == "J:" || t.deviceSelector[:2] == "j:" {
+	if t.deviceSelector[:2] == "J:" {
 		jp, err := jsonpath.Compile(t.deviceSelector[2:])
 		if err != nil {
 			log.Printf("Unable to compile deviceJsonpath: %s, %s", t.deviceSelector[2:], err)
@@ -55,7 +55,7 @@ func New(id string, config config.HandlerConfigT) handler.Handler {
 		t.deviceJsonpath = jp
 	}
 	t.valueSelector = config.Attributes["valueSelector"]
-	if t.valueSelector[:2] == "J:" || t.valueSelector[:2] == "j:" {
+	if t.valueSelector[:2] == "J:" {
 		jp, err := jsonpath.Compile(t.valueSelector[2:])
 		if err != nil {
 			log.Printf("Unable to compile valueJsonpath: %s, %s", t.valueSelector[2:], err)
@@ -64,7 +64,7 @@ func New(id string, config config.HandlerConfigT) handler.Handler {
 		t.valueJsonpath = jp
 	}
 	t.unitSelector = config.Attributes["unitSelector"]
-	if t.unitSelector[:2] == "J:" || t.unitSelector[:2] == "j:" {
+	if t.unitSelector[:2] == "J:" {
 		jp, err := jsonpath.Compile(t.unitSelector[2:])
 		if err != nil {
 			log.Printf("Unable to compile unitJsonpath: %s, %s", t.unitSelector[2:], err)
@@ -83,17 +83,13 @@ func New(id string, config config.HandlerConfigT) handler.Handler {
 func (self *SingleValueExtractorJsonpathHandler) ExtractionHelper(subTopics []string, jPayload interface{}, selector string, jp *jsonpath.Compiled) (interface{}, error) {
 	var res interface{}
 	switch selector[:2] {
-	case "J:", "j:":
+	case "J:":
 		// extract using jsonpath from payload
 		r, e := jp.Lookup(jPayload)
 		if e != nil {
 			return "", fmt.Errorf("jp.Lookup failed with %s", e)
 		}
-		if selector[:2] == "j:" {
+		res = r
-			res = r.(float64)
-		} else {
-			res = fmt.Sprint(r)
-		}
 	case "T:":
 		// T: extract from topic
 		i, e := strconv.Atoi(selector[2:])
@@ -152,12 +148,12 @@ func (self *SingleValueExtractorJsonpathHandler) Handle(message handler.MessageT
 		return
 	}
 
-	measurement.Device = device
+	measurement.Device = device.(string)
 
 	var variable database.VariableType
 	variable.Label = ""
 	variable.Variable = ""
-	variable.Unit = unit
+	variable.Unit = unit.(string)
 	variable.Value = value
 	measurement.Values = make(map[string]database.VariableType)
 	measurement.Values["Value"] = variable

src/udi/handlers/sver/sver.go

@@ -1,17 +1,16 @@
 package sver
 
 import (
-  "time"
+	"log"
+	"regexp"
 	"strconv"
 	"strings"
-  "regexp"
+	"time"
-  "log"
 	"udi/config"
-  "udi/handlers/handler"
 	"udi/database"
+	"udi/handlers/handler"
 )
 
-
 type SingleValueExtractorRegexHandler struct {
 	handler.CommonHandler
 	ready        bool
@@ -32,14 +31,14 @@ type localConfig struct {
 	device      string
 	valueFrom   string
 	valuePart   int
+	valueType   string
 	unitFrom    string
 	unitPart    int
 	unit        string
 }
 
-
 func New(id string, config config.HandlerConfigT) handler.Handler {
-  t := &SingleValueExtractorRegexHandler {
+	t := &SingleValueExtractorRegexHandler{
 		ready: false,
 	}
 
@@ -88,6 +87,12 @@ func New(id string, config config.HandlerConfigT) handler.Handler {
 		localConfig.valuePart = valuePart
 	}
 
+	if config.Attributes["valueType"] != "float" && config.Attributes["valueType"] != "string" {
+		log.Printf("Error: invalid value %s for valueType", config.Attributes["valueType"])
+		return t
+	}
+	localConfig.valueType = config.Attributes["valueType"]
+
 	if config.Attributes["unitFrom"] != PAYLOAD_SEL && config.Attributes["unitFrom"] != CONSTANT_SEL {
 		log.Printf("Error: invalid value %s for unitFrom", config.Attributes["unitFrom"])
 		return t
@@ -116,7 +121,7 @@ func New(id string, config config.HandlerConfigT) handler.Handler {
 }
 
 func (self *SingleValueExtractorRegexHandler) Handle(message handler.MessageT) {
-  if ! self.ready {
+	if !self.ready {
 		self.Lost("Handler is not marked as ready", nil, message)
 		return
 	}
@@ -161,6 +166,7 @@ func (self *SingleValueExtractorRegexHandler) Handle(message handler.MessageT) {
 	variable.Label = ""
 	variable.Variable = ""
 
+	var value string
 	switch self.config.valueFrom {
 	case PAYLOAD_SEL:
 		if self.payloadRegex == nil {
@@ -171,9 +177,19 @@ func (self *SingleValueExtractorRegexHandler) Handle(message handler.MessageT) {
 			self.Lost("valuePart out of range", nil, message)
 			return
 		}
-    variable.Value = payloadMatches[self.config.valuePart]
+		value = payloadMatches[self.config.valuePart]
 	case PAYLOAD_FULL_SEL:
-    variable.Value = message.Payload
+		value = message.Payload
+	}
+	if self.config.valueType == "float" {
+		fValue, err := strconv.ParseFloat(value, 64)
+		if err != nil {
+			self.Lost("Unable to convert value to float", err, message)
+			return
+		}
+		variable.Value = fValue
+	} else {
+		variable.Value = value
 	}
 
 	switch self.config.unitFrom {
@@ -197,4 +213,3 @@ func (self *SingleValueExtractorRegexHandler) Handle(message handler.MessageT) {
 	self.dbh.StoreMeasurement(&measurement)
 	self.S()
 }
-