float fix 4

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()
 }
-
-