running with pgsql

2 files changed, 17 insertions, 14 deletions

diff --git a/ebus/__init__.py b/ebus/__init__.py
index 58192b9..7b8c8ed 100644
--- a/ebus/__init__.py
+++ b/ebus/__init__.py
@@ -44,15 +44,15 @@ class EbusPacket(object):
                 self.primary_command,
                 self.secondary_command))
 
-    def _get_source_name(self):
+    def get_source_name(self):
         s=EbusPacket.ebus_xml.xpath("/ebus/devices/device[@address=$address]",
                                       address="#x%.2x"%self.source)
-        return len(s)>0 and s[0] or None
+        return len(s)>0 and s[0].get("name") or None
 
-    def _get_destination_name(self):
+    def get_destination_name(self):
         d=EbusPacket.ebus_xml.xpath("/ebus/devices/device[@address=$address]",
                                       address="#x%.2x"%self.destination)
-        return len(d)>0 and d[0] or None
+        return len(d)>0 and d[0].get("name") or None
                                         
     def name(self):
         return self.get_packet_description().get("name")
diff --git a/ebus/model/sql.py b/ebus/model/sql.py
index 630e31c..de13239 100644
--- a/ebus/model/sql.py
+++ b/ebus/model/sql.py
@@ -26,7 +26,7 @@ class Value(ModelBase):
     __tablename__ = 'value'
 
     id = Column(Integer, primary_key=True)
-    timestamp = Column(DateTime)
+    timestamp = Column(DateTime,index=True)
     sensor_id = Column(Integer, ForeignKey("sensor.id"))
     sensor = relationship(Sensor, backref=backref('values', order_by=timestamp))
 
@@ -84,22 +84,25 @@ class EbusSQL(object):
 
     def get_values(self,packet):
         packet_description = packet.get_packet_description()
-        sensor_name = str(packet._get_source_name())
-        sensor = self.session.query(Sensor) \
-            .filter(Sensor.name==sensor_name).first()
-        if sensor is None:
-            sensor = Sensor(sensor_name)
-            self.session.add(sensor)
-
+        packet_source_name = packet.get_source_name()
+        packet_name = packet.name()
         for field in packet_description.fields.iterchildren():
             try:
                 name = field.get("name")
                 offset = int(field.get("offset"))
                 if not name:
                     continue
-                elif field.tag == "bit":
+
+                sensor_name = "%s.%s.%s" % (packet_source_name, packet_name, name )
+                sensor = self.session.query(Sensor) \
+                    .filter(Sensor.name==sensor_name).first()
+                if sensor is None:
+                    sensor = Sensor(sensor_name)
+                    self.session.add(sensor)
+
+                if field.tag == "bit":
                     yield ValueInt(sensor, \
-                                       model.Bit(name, offset).value(packet.data))
+                                       model.Bit(name, offset).value(packet.data) and 1 or 0)
                 elif field.tag == "byte":
                     yield ValueInt(sensor, \
                                        model.Byte(name, offset).value(packet.data))