rename PanicButton to BoreDooomButton and eliminate door id

[svn42.git] / go / r3-eventbroker_zmq / r3events / marshal_events.go

diff --git a/go/r3-eventbroker_zmq/r3events/marshal_events.go b/go/r3-eventbroker_zmq/r3events/marshal_events.go
index d00d462..66799c7 100644 (file)
--- a/go/r3-eventbroker_zmq/r3events/marshal_events.go
+++ b/go/r3-eventbroker_zmq/r3events/marshal_events.go
@@ -9,17 +9,20 @@ import (
     "strings"
     )
 
+func NameOfStruct(evi interface{}) (name string) {
+    etype := fmt.Sprintf("%T", evi)
+    etype_lastsep := strings.LastIndex(etype,".")
+    return etype[etype_lastsep+1:] //works in all cases for etype_lastsep in range -1 to len(etype)-1
+}
 
 func MarshalEvent2ByteByte(event_interface interface{}) (data [][]byte, err error) {
     var msg []byte
-    fmt.Printf("%T%+v\n", event_interface, event_interface)
+    //~ fmt.Printf("%T%+v\n", event_interface, event_interface)
        msg, err = json.Marshal(event_interface)
        if err != nil {
                return
        }
-    etype := fmt.Sprintf("%T", event_interface)
-    etype_lastsep := strings.LastIndex(etype,".")
-    data = [][]byte{[]byte(etype[etype_lastsep+1:]), msg} //works in all cases for etype_lastsep in range -1 to len(etype)-1
+    data = [][]byte{[]byte(NameOfStruct(event_interface)), msg} //works in all cases for etype_lastsep in range -1 to len(etype)-1
     return
 }
 
@@ -34,11 +37,14 @@ func UnmarshalByteByte2Event(data [][]byte) (event interface{}, err error) {
         case "DoorAjarUpdate":
             event := new(DoorAjarUpdate)
             err = json.Unmarshal(data[1], event)
+        case "BackdoorAjarUpdate":
+            event := new(DoorAjarUpdate)
+            err = json.Unmarshal(data[1], event)
         case "DoorCommandEvent":
             event := new(DoorCommandEvent)
             err = json.Unmarshal(data[1], event)
-        case "ButtonPressUpdate":
-            event := new(ButtonPressUpdate)
+        case "BoreDoomButtonPressEvent":
+            event := new(BoreDoomButtonPressEvent)
             err = json.Unmarshal(data[1], event)
         case "TempSensorUpdate":
             event := new(TempSensorUpdate)