|
|
|
|
@@ -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.(float64)
|
|
|
|
|
} else {
|
|
|
|
|
res = fmt.Sprint(r)
|
|
|
|
|
}
|
|
|
|
|
res = 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
|
|
|
|
|
|