still database stuff, fix 5

src/locsrv/database/database.go

@@ -37,7 +37,7 @@ func (self *DatabaseHandle) GetPersonById(id string) (string, error) {
 
   var person Person
   result := self.dbh.
-    Where("persons.id = ?", id).
+    Where("id = ?", id).
     First(&person)
 
   if result.Error != nil {

src/locsrv/main.go

@@ -24,6 +24,8 @@ type locativeEvent struct {
   Trigger string `json:"trigger"`
   Device string `json:"device"`
   Id string `json:"id"`
+  Latitude string `json:"latitude"`
+  Longitude string `json:"longitude"`
 }
 
 
@@ -37,13 +39,12 @@ func main() {
     for {
       select {
       case event := <- ch:
-        log.Printf("Trigger: %s, Device: %s, Id: %s", event.Trigger, event.Device, event.Id)
         person, err := dbh.GetPersonById(event.Device)
         if err != nil {
           log.Printf("Person unknown: %v", err)
-        } else {
-          log.Printf("Person: %s", person)
+          person = "unknown"
         } 
+        log.Printf("Trigger: %s, Device: %s, Id: %s, Person: %s, Latitude: %s, Longitude: %s", event.Trigger, event.Device, event.Id, person, event.Latitude, event.Longitude)
       }
     }
   }()