projects
/
svn42.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
--bugs
[svn42.git]
/
go
/
r3events
/
marshal_events.go
diff --git
a/go/r3events/marshal_events.go
b/go/r3events/marshal_events.go
index
041452c
..
212f9b1
100644
(file)
--- a/
go/r3events/marshal_events.go
+++ b/
go/r3events/marshal_events.go
@@
-32,69
+32,85
@@
func UnmarshalByteByte2Event(data [][]byte) (event interface{}, category string,
}
switch string(data[0]) {
case "DoorLockUpdate":
}
switch string(data[0]) {
case "DoorLockUpdate":
- event = DoorLockUpdate{}
- err = json.Unmarshal(data[1],&event)
+ newevent := new(DoorLockUpdate)
+ err = json.Unmarshal(data[1],newevent)
category = "door"
category = "door"
+ event = *newevent
case "DoorAjarUpdate":
case "DoorAjarUpdate":
- event := DoorAjarUpdate{}
- err = json.Unmarshal(data[1], &event)
+ newevent := new(DoorAjarUpdate)
+ err = json.Unmarshal(data[1], newevent)
category = "door"
category = "door"
+ event = *newevent
case "BackdoorAjarUpdate":
case "BackdoorAjarUpdate":
- event := DoorAjarUpdate{}
- err = json.Unmarshal(data[1], &event)
+ newevent := new(BackdoorAjarUpdate)
+ err = json.Unmarshal(data[1], newevent)
category = "door"
category = "door"
+ event = *newevent
case "DoorCommandEvent":
case "DoorCommandEvent":
- event := DoorCommandEvent{}
- err = json.Unmarshal(data[1], &event)
+ newevent := new(DoorCommandEvent)
+ err = json.Unmarshal(data[1], newevent)
category = "door"
category = "door"
+ event = *newevent
case "DoorProblemEvent":
case "DoorProblemEvent":
- event := DoorProblemEvent{}
- err = json.Unmarshal(data[1], &event)
+ newevent := new(DoorProblemEvent)
+ err = json.Unmarshal(data[1], newevent)
category = "door"
category = "door"
+ event = *newevent
case "BoreDoomButtonPressEvent":
case "BoreDoomButtonPressEvent":
- event := BoreDoomButtonPressEvent{}
- err = json.Unmarshal(data[1], &event)
+ newevent := new(BoreDoomButtonPressEvent)
+ err = json.Unmarshal(data[1], newevent)
category = "buttons"
category = "buttons"
+ event = *newevent
case "TempSensorUpdate":
case "TempSensorUpdate":
- event := TempSensorUpdate{}
- err = json.Unmarshal(data[1], &event)
+ newevent := new(TempSensorUpdate)
+ err = json.Unmarshal(data[1], newevent)
category = "sensors"
category = "sensors"
+ event = *newevent
case "IlluminationSensorUpdate":
case "IlluminationSensorUpdate":
- event := IlluminationSensorUpdate{}
- err = json.Unmarshal(data[1], &event)
+ newevent := new(IlluminationSensorUpdate)
+ err = json.Unmarshal(data[1], newevent)
category = "sensors"
category = "sensors"
+ event = *newevent
case "DustSensorUpdate":
case "DustSensorUpdate":
- event := DustSensorUpdate{}
- err = json.Unmarshal(data[1], &event)
+ newevent := new(DustSensorUpdate)
+ err = json.Unmarshal(data[1], newevent)
category = "sensors"
category = "sensors"
+ event = *newevent
case "RelativeHumiditySensorUpdate":
case "RelativeHumiditySensorUpdate":
- event := RelativeHumiditySensorUpdate{}
- err = json.Unmarshal(data[1], &event)
+ newevent := new(RelativeHumiditySensorUpdate)
+ err = json.Unmarshal(data[1], newevent)
category = "sensors"
category = "sensors"
+ event = *newevent
case "TimeTick":
case "TimeTick":
- event := TimeTick{}
- err = json.Unmarshal(data[1], &event)
+ newevent := new(TimeTick)
+ err = json.Unmarshal(data[1], newevent)
category = "time"
category = "time"
+ event = *newevent
case "MovementSensorUpdate":
case "MovementSensorUpdate":
- event := MovementSensorUpdate{}
- err = json.Unmarshal(data[1], &event)
+ newevent := new(MovementSensorUpdate)
+ err = json.Unmarshal(data[1], newevent)
category = "movement"
category = "movement"
+ event = *newevent
case "PresenceUpdate":
case "PresenceUpdate":
- event := PresenceUpdate{}
- err = json.Unmarshal(data[1], &event)
+ newevent := new(PresenceUpdate)
+ err = json.Unmarshal(data[1], newevent)
category = "presence"
category = "presence"
+ event = *newevent
case "SomethingReallyIsMoving":
case "SomethingReallyIsMoving":
- event := SomethingReallyIsMoving{}
- err = json.Unmarshal(data[1], &event)
+ newevent := new(SomethingReallyIsMoving)
+ err = json.Unmarshal(data[1], newevent)
category = "movement"
category = "movement"
+ event = *newevent
case "NetDHCPACK":
case "NetDHCPACK":
- event := NetDHCPACK{}
- err = json.Unmarshal(data[1], &event)
+ newevent := new(NetDHCPACK)
+ err = json.Unmarshal(data[1], newevent)
category = "network"
category = "network"
+ event = *newevent
case "NetGWStatUpdate":
case "NetGWStatUpdate":
- event := NetGWStatUpdate{}
- err = json.Unmarshal(data[1], &event)
+ newevent := new(NetGWStatUpdate)
+ err = json.Unmarshal(data[1], newevent)
category = "network"
category = "network"
+ event = *newevent
default:
event = nil
err = errors.New("cannot unmarshal unknown type")
default:
event = nil
err = errors.New("cannot unmarshal unknown type")