small j for float

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

@@ -185,7 +185,7 @@
         "attributes": {
           "application": "Shellies Sensor Temperature",
           "deviceSelector": "T:2",
-          "valueSelector": "J:$.tC",
+          "valueSelector": "j:$.tC",
           "unitSelector": "C:°C"
         }
       }
@@ -199,7 +199,7 @@
         "attributes": {
           "application": "Shellies Sensor Humidity",
           "deviceSelector": "T:2",
-          "valueSelector": "J:$.rh",
+          "valueSelector": "j:$.rh",
           "unitSelector": "C:%"
         }
       }
@@ -213,7 +213,7 @@
         "attributes": {
           "application": "Shellies Sensor Power",
           "deviceSelector": "T:2",
-          "valueSelector": "J:$.percent",
+          "valueSelector": "j:$.battery.percent",
           "unitSelector": "C:%"
         }
       }

src/udi/handlers/svej/svej.go

@@ -1,16 +1,17 @@
 package svej
 
 import (
+	"encoding/json"
+	"fmt"
 	"log"
-  "time"
 	"strconv"
 	"strings"
-  "fmt"
-  "github.com/oliveagle/jsonpath"
-  "encoding/json"
+	"time"
 	"udi/config"
-  "udi/handlers/handler"
 	"udi/database"
+	"udi/handlers/handler"
+
+	"github.com/oliveagle/jsonpath"
 )
 
 type SingleValueExtractorJsonpathHandler struct {
@@ -33,9 +34,8 @@ T:TopicPartIndex
 C:ConstantValue
 */
 
-
 func New(id string, config config.HandlerConfigT) handler.Handler {
-  t := &SingleValueExtractorJsonpathHandler {
+	t := &SingleValueExtractorJsonpathHandler{
 		ready: false,
 	}
 
@@ -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:" {
+	if t.deviceSelector[:2] == "J:" || 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:" {
+	if t.valueSelector[:2] == "J:" || 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:" {
+	if t.unitSelector[:2] == "J:" || 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)
@@ -76,20 +76,24 @@ func New(id string, config config.HandlerConfigT) handler.Handler {
 	t.Id = id
 	t.ready = true
 	t.dbh = database.NewDatabaseHandle()
-  log.Printf("Handler SVEJ %d initialized", id)
+	log.Printf("Handler SVEJ %s initialized", id)
 	return t
 }
 
-func (self *SingleValueExtractorJsonpathHandler) ExtractionHelper(subTopics []string, jPayload interface{}, selector string, jp *jsonpath.Compiled) (string, error) {
-  var res string
+func (self *SingleValueExtractorJsonpathHandler) ExtractionHelper(subTopics []string, jPayload interface{}, selector string, jp *jsonpath.Compiled) (interface{}, error) {
+	var res interface{}
 	switch selector[:2] {
-  case "J:":
+	case "J:", "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.(float64)
+		} else {
 			res = fmt.Sprint(r)
+		}
 	case "T:":
 		// T: extract from topic
 		i, e := strconv.Atoi(selector[2:])
@@ -109,9 +113,8 @@ func (self *SingleValueExtractorJsonpathHandler) ExtractionHelper(subTopics []st
 	return res, nil
 }
 
-
 func (self *SingleValueExtractorJsonpathHandler) Handle(message handler.MessageT) {
-  if ! self.ready {
+	if !self.ready {
 		self.Lost("Handler is not marked as ready", nil, message)
 		return
 	}
@@ -163,4 +166,3 @@ func (self *SingleValueExtractorJsonpathHandler) Handle(message handler.MessageT
 	self.dbh.StoreMeasurement(&measurement)
 	self.S()
 }
-