Thread: [Openautomation-svn] SF.net SVN: openautomation:[65] PyWireGate/trunk

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 65
          http://openautomation.svn.sourceforge.net/openautomation/?rev=65&view=rev
Author:   nilss1
Date:     2010-11-03 13:17:57 +0000 (Wed, 03 Nov 2010)

Log Message:
-----------
sorry, too many updates cleanup later, just want to keep a version in repo

Modified Paths:
--------------
    PyWireGate/trunk/WireGate.py
    PyWireGate/trunk/connector.py
    PyWireGate/trunk/datastore.py
    PyWireGate/trunk/knx_connector/BusMonitor.py
    PyWireGate/trunk/knx_connector/DPT_Types.py
    PyWireGate/trunk/knx_connector/GroupSocket.py
    PyWireGate/trunk/knx_connector/KNX_Connector.py
    PyWireGate/trunk/owfs_connector/OWFS_Connector.py
    PyWireGate/trunk/owfs_connector/connection.py

Added Paths:
-----------
    PyWireGate/trunk/DSupdate.py
    PyWireGate/trunk/simplejson/
    PyWireGate/trunk/simplejson/.___init__.py
    PyWireGate/trunk/simplejson/._decoder.py
    PyWireGate/trunk/simplejson/._scanner.py
    PyWireGate/trunk/simplejson/__init__.py
    PyWireGate/trunk/simplejson/_speedups.c
    PyWireGate/trunk/simplejson/decoder.py
    PyWireGate/trunk/simplejson/encoder.py
    PyWireGate/trunk/simplejson/ordered_dict.py
    PyWireGate/trunk/simplejson/scanner.py
    PyWireGate/trunk/simplejson/tests/
    PyWireGate/trunk/simplejson/tests/.___init__.py
    PyWireGate/trunk/simplejson/tests/._test_dump.py
    PyWireGate/trunk/simplejson/tests/._test_errors.py
    PyWireGate/trunk/simplejson/tests/._test_fail.py
    PyWireGate/trunk/simplejson/tests/__init__.py
    PyWireGate/trunk/simplejson/tests/test_check_circular.py
    PyWireGate/trunk/simplejson/tests/test_decimal.py
    PyWireGate/trunk/simplejson/tests/test_decode.py
    PyWireGate/trunk/simplejson/tests/test_default.py
    PyWireGate/trunk/simplejson/tests/test_dump.py
    PyWireGate/trunk/simplejson/tests/test_encode_basestring_ascii.py
    PyWireGate/trunk/simplejson/tests/test_encode_for_html.py
    PyWireGate/trunk/simplejson/tests/test_errors.py
    PyWireGate/trunk/simplejson/tests/test_fail.py
    PyWireGate/trunk/simplejson/tests/test_float.py
    PyWireGate/trunk/simplejson/tests/test_indent.py
    PyWireGate/trunk/simplejson/tests/test_pass1.py
    PyWireGate/trunk/simplejson/tests/test_pass2.py
    PyWireGate/trunk/simplejson/tests/test_pass3.py
    PyWireGate/trunk/simplejson/tests/test_recursion.py
    PyWireGate/trunk/simplejson/tests/test_scanstring.py
    PyWireGate/trunk/simplejson/tests/test_separators.py
    PyWireGate/trunk/simplejson/tests/test_speedups.py
    PyWireGate/trunk/simplejson/tests/test_unicode.py
    PyWireGate/trunk/simplejson/tool.py

Added: PyWireGate/trunk/DSupdate.py
===================================================================

--- PyWireGate/trunk/DSupdate.py	                        (rev 0)
+++ PyWireGate/trunk/DSupdate.py	2010-11-03 13:17:57 UTC (rev 65)
@@ -0,0 +1,161 @@
+import getopt
+import ConfigParser
+try:
+    import cPickle as pickle
+except ImportError:
+    import pickle
+
+try:
+    import json
+except ImportError:
+    import simplejson as json
+
+
+import datastore
+
+import sys
+
+class dbloader:
+    def __init__(self,config,fname):
+        self.config = config
+        self.dataobjects = {}
+        ## load datastore
+        self.load()
+        if config['type'].upper() == "KNX":
+            self.KNXloader(fname)
+        elif config['type'].upper() == "OWFS":
+            self.OWFSloader(fname)
+        self.save()
+
+    def readConfig(self,configfile):
+        cfile = open(configfile,"r")
+        ## fix for missingsectionheaders
+        while True:
+            pos = cfile.tell()
+            if cfile.readline().startswith("["):
+                break
+        cfile.seek(pos)
+        config = {}
+        configparse = ConfigParser.SafeConfigParser()
+        configparse.readfp(cfile)
+        for section in configparse.sections():
+            options = configparse.options(section)
+            config[section] = {}
+            for opt in options:
+                try:
+                    config[section][opt] = configparse.getint(section,opt)
+                except ValueError:
+                    try:
+                        config[section][opt] = configparse.getfloat(section,opt)
+                    except ValueError:
+                        config[section][opt] = configparse.get(section,opt)
+        
+        return config
+
+    def KNXloader(self,fname):
+        ga = self.readConfig(fname)
+        for key in ga.keys():
+            id = "%s:%s" % (self.config['namespace'],key)
+            self.dataobjects[id] = datastore.dataObject(False,id,unicode(ga[key]['name'],errors='ignore'))
+            self.dataobjects[id].config['dptid'] = ga[key]['dptsubid']
+
+    def OWFSloader(self,fname):
+        ow = self.readConfig(fname)
+        for key in ow.keys():
+            id = "%s:%s_temperature" % (self.config['namespace'],key)
+            print "add %s " % id
+            self.dataobjects[id] = datastore.dataObject(False,id,unicode(ow[key]['name'],errors='ignore'))
+            if 'resolution' in ow[key]:
+                self.dataobjects[id].config['resolution'] = ow[key]['resolution']
+            if 'eib_ga_temp' in ow[key]:
+                if len(ow[key]['eib_ga_temp']) >0:
+                    knxid = "KNX:%s" % ow[key]['eib_ga_temp']
+                    print "Try to attach to  %s " % knxid
+                    self.dataobjects[id].connected.append(knxid)
+                    print "attaached"
+
+
+    def debug(self,msg=''):
+        print msg
+
+    def load(self):
+        ## TODO:
+        self.debug("load DATASTORE")
+        try:
+            db = open(self.config['datastore'],"rb")
+            #loaddict = pickle.Unpickler(db).load()
+            loaddict = json.load(db)
+            db.close()
+            for name, obj in loaddict.items():
+                self.dataobjects[name] = datastore.dataObject(False,obj['id'],obj['name'])
+                self.dataobjects[name].lastupdate = obj['lastupdate']
+                self.dataobjects[name].config = obj['config']
+                self.dataobjects[name].connected = obj['connected']
+            self.debug("%d entries loaded in DATASTORE" % len(self.dataobjects))
+        except:
+            ## no DB File
+            print "DB not found"
+            pass
+            ## Fixme: should belong to conncetor
+        
+
+
+    def save(self):
+        ## TODO:
+        self.debug("save DATASTORE")
+        savedict = {}
+        ## FIXME: user create a __reduce__ method for the Datastoreitem object
+        for name,obj in  self.dataobjects.items():
+            savedict[name] = {
+                'name' : obj.name,
+                'id' : obj.id,
+                'value' : obj.value,
+                'lastupdate' : obj.lastupdate,
+                'config' : obj.config,
+                'connected' : obj.connected
+            }
+        dbfile = open(self.config['datastore'],"wb")
+        #db = pickle.Pickler(dbfile,-1)
+        #db.dump(savedict)
+        json.dump(savedict,dbfile,sort_keys=True,indent=3)
+        dbfile.close()
+        for i in savedict.keys():
+            if len(savedict[i]['connected'])>0:
+                print savedict[i]
+
+
+if __name__ == "__main__":
+        import os
+        import sys
+        import getopt
+        try:
+            opts, args = getopt.getopt(sys.argv[1:], "f:d:n:t:", ["file=","datastore=","namespace=","type="])
+        except getopt.GetoptError:
+            print "Fehler"
+            sys.exit(2)
+        config = {
+            'datastore' : 'datastore.db',
+            'namespace' : 'KNX',
+            'type' : False
+        }
+        fname = False
+        for opt, arg in opts:
+            if opt in ("-d","--datastore"):
+                config['datastore'] = arg
+
+            if opt in ("-n","--namespace"):
+                config['namespace'] = arg
+
+            if opt in ("-t","--type"):
+                config['type'] = arg
+
+            if opt in ("-f","--file"):
+                fname = arg
+
+        if not fname:
+            print "no configfilename"
+            sys.exit(1)
+        if not config['type']:
+            config['type'] = config['namespace']
+        dbloader(config,fname)
+

Modified: PyWireGate/trunk/WireGate.py
===================================================================
--- PyWireGate/trunk/WireGate.py	2010-11-01 21:14:31 UTC (rev 64)
+++ PyWireGate/trunk/WireGate.py	2010-11-03 13:17:57 UTC (rev 65)
@@ -58,6 +58,7 @@
         self.config = self.readConfig("/etc/wiregate/pywiregate.conf")
         defaultconfig = {
             'pidfile' : "%s/wiregated.pid" % self.scriptpath,
+            'datastore' : "%s/datastore.db" % self.scriptpath,
             'logfile' : "%s/wiregated.log" % self.scriptpath,
             'errorlog' : "%s/wiregated-error.log" % self.scriptpath,
             'loglevel': 'info'
@@ -148,6 +149,7 @@
                 ##Set Permissions
                 os.chown(self.config['WireGate']['pidfile'],runasuser[2],runasuser[3])
                 os.chown(self.config['WireGate']['logfile'],runasuser[2],runasuser[3])
+                os.chown(self.config['WireGate']['datastore'],runasuser[2],runasuser[3])
                 os.setregid(runasuser[3],runasuser[3])
                 os.setreuid(runasuser[2],runasuser[2])
         
@@ -251,8 +253,6 @@
 
     ## Logger for all instances that check/create logger based on Configfile
     def log(self,msg,severity="info",instance="WireGate"):
-        LEVELS = {'debug': logging.debug,'info': logging.info,'warning': logging.warning,'warn': logging.warning,'error': logging.error,'critical': logging.critical}
-        level = LEVELS.get(severity, logging.info)
         try:
             logger = self.LOGGER[instance]
         except KeyError:
@@ -262,8 +262,12 @@
             logger.debug(msg)
         elif severity=="info":
             logger.info(msg)
+        elif severity=="notice":
+            logger.info(msg)
         elif severity=="warning":
             logger.warning(msg)
+        elif severity=="warn":
+            logger.warning(msg)
         elif severity=="error":
             logger.error(msg)
         elif severity=="critical":

Modified: PyWireGate/trunk/connector.py
===================================================================
--- PyWireGate/trunk/connector.py	2010-11-01 21:14:31 UTC (rev 64)
+++ PyWireGate/trunk/connector.py	2010-11-03 13:17:57 UTC (rev 65)
@@ -47,6 +47,10 @@
             pass
             
 
+    def setValue(self, dsobj):
+        self.log("unconfigured setValue in %r called for %s" % (self,dsobj.name) ,'warn','WireGate')
+        pass
+
 import SocketServer
 import socket
 class ConnectorServer(SocketServer.ThreadingMixIn, SocketServer.TCPServer,Connector):

Modified: PyWireGate/trunk/datastore.py
===================================================================
--- PyWireGate/trunk/datastore.py	2010-11-01 21:14:31 UTC (rev 64)
+++ PyWireGate/trunk/datastore.py	2010-11-03 13:17:57 UTC (rev 65)
@@ -1,7 +1,19 @@
 import time
 import threading
 
+try:
+    import cPickle as pickle
+except ImportError:
+    import pickle
 
+try:
+    import json
+except ImportError:
+    import simplejson as json
+
+import sys
+import xml.dom.minidom
+
 class datastore:
     """
         Datastore Instance
@@ -16,23 +28,15 @@
         ##
         ####################################################
         self.WG = WireGateInstance
+        self.log("DATASTORE starting up")
         self.dataobjects = {}
-        
+        self.locked = threading.RLock()
+        self.locked.acquire()
+        self.xmltag = lambda x,y,z='': len(z)>0 and "<%s %s>%s</%s>" % (x,z,y,x) or "<%s>%s</%s>" % (x,y,x)
         ## Load XML Database
         self.load()
         
-        ## Fixme: should belong to conncetor
-        self.readgaconf()
-        
     
-    ## FIXME: that should belong to the Connector
-    def readgaconf(self):
-        ga = self.WG.readConfig("/etc/wiregate/eibga.conf")
-        for key in ga.keys():
-            obj = self.get("KNX:%s" % key)
-            obj.dptid = ga[key]['dptsubid']
-            obj.name = ga[key]['name']
-    
     def update(self,id,val):
         ## Update the communication Object with value
         ####################################################
@@ -44,14 +48,23 @@
         ##    update or create a Datastoreobject
         ##    schould be used by all connectors to set their Values
         ####################################################
+        ## 
         ## get the Datastore object
         obj = self.get(id)
         self.debug("Updating %s (%s): %r" % (obj.name,id,val))
 
         ## Set the value of the object
         obj.setValue(val)
-
+        
         ##TODO: central subscriber function for other connectore or servers
+        
+        for attached in obj.connected:
+            try:
+                self.dataobjects[attached].setValue(val,True)
+            except:
+                print "FAILED %s" % attached
+                __import__('traceback').print_exc(file=__import__('sys').stdout)                
+                pass
 
         
         ## return the object for additional updates
@@ -66,6 +79,7 @@
         ##    returns or create and returns the Dataobejct with ID id
         ##
         ####################################################
+        self.locked.acquire()
         try:
             ## check for existence
             type(self.dataobjects[id])
@@ -73,18 +87,88 @@
             ## create a new one if it don't exist
             self.dataobjects[id] = dataObject(self.WG,id)
         ## return it
+        self.locked.release()
         return self.dataobjects[id]
 
 
+    ## FIXME: that should belong to the Connector
+    def readgaconf(self):
+        print "SHOULD NOT BE CALLED"
+        ga = self.WG.readConfig("/etc/wiregate/eibga.conf")
+        for key in ga.keys():
+            obj = self.get("KNX:%s" % key)
+            obj.config['dptid'] = ga[key]['dptsubid']
+            obj.name = ga[key]['name']
+            obj._send = self.WG.connectors['KNX'].send
+
+
     def load(self):
         ## TODO:
         self.debug("load DATASTORE")
-        pass
+        try:
+            db = open(self.WG.config['WireGate']['datastore'],"rb")
+            #loaddict = pickle.Unpickler(db).load()
+            loaddict = json.load(db)
+            db.close()
+            for name, obj in loaddict.items():
+                self.dataobjects[name] = dataObject(self.WG,obj['id'],obj['name'])
+                self.dataobjects[name].lastupdate = obj['lastupdate']
+                self.dataobjects[name].config = obj['config']
+                self.dataobjects[name].connected = obj['connected']
+            self.debug("%d entries loaded in DATASTORE" % len(self.dataobjects))
+            self.locked.release()
+        except IOError:
+            ## no DB File
+            pass
+            ## Fixme: should belong to conncetor
+            self.locked.release()
+            self.readgaconf()
+        
+        except:
+            ## error
+            pass
 
+
     def save(self):
         ## TODO:
         self.debug("save DATASTORE")
-        pass
+        self.locked.acquire()
+        savedict = {}
+        ## FIXME: user create a __reduce__ method for the Datastoreitem object
+        for name,obj in  self.dataobjects.items():
+            savedict[name] = {
+                'name' : obj.name,
+                'id' : obj.id,
+                'value' : obj.value,
+                'lastupdate' : obj.lastupdate,
+                'config' : obj.config,
+                'connected' : obj.connected
+            }
+        dbfile = open(self.WG.config['WireGate']['datastore'],"wb")
+        #db = pickle.Pickler(dbfile,-1)
+        #db.dump(savedict)
+        json.dump(savedict,dbfile,sort_keys=True,indent=3)
+        dbfile.close()
+        
+
+    def savetoXML(self):
+        objitemxml = ""
+        for name,obj in  self.dataobjects.items():
+             configxml = ""
+             for cname,cval in obj.config.items():
+                  configxml += self.xmltag(cname,cval)
+             objitemxml += self.xmltag(
+                    "DSitem",
+                    self.xmltag("id",name) + 
+                    self.xmltag("value",obj.getValue(),'type=%r' % type(obj.value).__name__) +
+                    self.xmltag("config",configxml)
+                    )
+        self.locked.release()
+        xmlout = xml.dom.minidom.parseString(self.xmltag("Datastore",objitemxml))
+        #xmlout = xmlout.toprettyxml(indent="  ")
+        xmlout = xmlout.toxml()
+        ## write binary to preserve UTF8
+        open(self.WG.config['WireGate']['datastore'],"wb").write(xmlout)
     
     def debug(self,msg):
         ####################################################
@@ -109,6 +193,7 @@
         ## Threadlocking
         self.write_mutex = threading.RLock()
         self.read_mutex = threading.RLock()
+        
         ## check for namespace
         namespace = id.split(":",1)
         if len(namespace)>1:
@@ -116,10 +201,14 @@
         else:
             ## Fixme: maybe default Namespace
             namespace = ""
+        self.namespace = namespace    
+
+        if not name:
+            ## Initial Name 
+            self.name = "%s:unbekannt-%s" % (namespace, time.strftime("%Y-%m-%d_%H:%M:%S"))
+        else:
+            self.name = name
         
-        ## Initial Name 
-        self.name = "%s:unbekannt-%s" % (namespace, time.strftime("%Y-%m-%d_%H:%M:%S"))
-        
         ## some defaults
         self.value = ""
         self.lastupdate = 0
@@ -132,9 +221,18 @@
         self.config = {}
         
         ## connected Logics, communication objects ... goes here
-        self.connected = {}
+        self.connected = []
 
-    def setValue(self,val):
+    def _setValue(self,refered_self):
+        ## self override 
+        print "Ovveride now"
+        if self.namespace:
+            self._setValue = self.WG.connectors[self.namespace].setValue
+            self.WG.connectors[self.namespace].setValue(refered_self)
+        ## override with connector send function
+        pass
+
+    def setValue(self,val,send=False):
         try:
             ## get read lock
             self.read_mutex.acquire()
@@ -143,6 +241,8 @@
             ## save the modified time
             self.lastupdate = time.time()
             self.value = val
+            if send:
+                self._setValue(self)
         finally:
             ## release locks
             self.write_mutex.release()
@@ -160,3 +260,39 @@
 
         
 
+#import json
+
+def JSON2DataStore(text):
+    obj = {}
+    return obj
+
+
+def DataStore2JSON(obj):
+    text = ""
+    return text
+
+class testtwo:
+    def __init__(self):
+        self.i=10
+    def _send(self,val):
+        """Hallo"""
+        print str(dir(self)) +str(val+self.i)
+        
+class testthree:
+    def __init__(self):
+        self.u=1
+    def send(self,val):
+        """its me"""
+        print str(dir(self)) +str(self.u)
+    
+        
+
+if __name__ == "__main__":
+    two = testtwo()
+    two._send(20)
+    three = testthree()
+    two._send = three.send
+    two._send(20)
+    print two._send
+    print dir(two)
+    
\ No newline at end of file

Modified: PyWireGate/trunk/knx_connector/BusMonitor.py
===================================================================
--- PyWireGate/trunk/knx_connector/BusMonitor.py	2010-11-01 21:14:31 UTC (rev 64)
+++ PyWireGate/trunk/knx_connector/BusMonitor.py	2010-11-03 13:17:57 UTC (rev 65)
@@ -20,11 +20,12 @@
 import time
 
 class busmonitor:
-    def __init__(self, WireGateInstance):
+    def __init__(self, WireGateInstance,connectorInstance):
         self.WG = WireGateInstance
+        self.KNX = connectorInstance
         self.nicehex=lambda x: " ".join(map(lambda y:"%.2x" % y,x))
         self.tobinstr=lambda n,b=8: "".join([str((n >> y) & 1) for y in range(b-1, -1, -1)])
-        self.dpt = DPT_Types.dpt_type()
+        self.dpt = DPT_Types.dpt_type(WireGateInstance)
 
         ## FIXME: Not fully implemented
         self.apcicodes = {
@@ -99,8 +100,9 @@
             
             if msg['ctrl2']['DestAddrType'] == 0 and msg['apdu']['tpdu'] == "T_DATA_XXX_REQ":
                 msg['dstaddr'] = self._decodeGrpAddr(buf[3:5])
-                id = "KNX:%s" % msg['dstaddr']
                 
+                id = "%s:%s" % (self.KNX.instanceName, msg['dstaddr'])
+
                 ## search Datastoreobject
                 dsobj = self.WG.DATASTORE.get(id)
                 ## Decode the DPT Value
@@ -121,12 +123,8 @@
         return msg
 
 
-    def errormsg(self,msg=''):
-        f=open("/tmp/WGerror","a+")
-        __import__('traceback').print_exc(file=f)
-        f.write(time.asctime())
-        f.write("MSG:"+repr(msg))
-        f.close()
+    def errormsg(self,msg=False):
+        self.WG.errorlog(msg)
 
         
     def _decodeCtrlField1(self,raw):

Modified: PyWireGate/trunk/knx_connector/DPT_Types.py
===================================================================
--- PyWireGate/trunk/knx_connector/DPT_Types.py	2010-11-01 21:14:31 UTC (rev 64)
+++ PyWireGate/trunk/knx_connector/DPT_Types.py	2010-11-03 13:17:57 UTC (rev 65)
@@ -21,7 +21,7 @@
 ### sondern als LIST mit den dezimalen Werten ist das decode hier ein bischen angepasst
 
 class dpt_type:
-    def __init__(self,WireGateInstance=False):
+    def __init__(self,WireGateInstance):
         self.WG = WireGateInstance
         self.DECODER = {
             1:self.decodeDPT1,       # EIS 1/7       / 1 bit  0=Aus/1=Ein
@@ -50,7 +50,8 @@
         if dptid > 0:
             dpt = dptid
         elif dsobj:
-            dpt = dsobj.dptid
+            if "dptid" in dsobj.config:
+                dpt = dsobj.config['dptid']
         else:
             return False
         if dpt == -1:
@@ -75,13 +76,18 @@
             self.errormsg()
             return raw
 
-    def errormsg(self,msg=''):
-        __import__('traceback').print_exc(file=__import__('sys').stdout)
+    def errormsg(self,msg=False):
+        self.WG.errormsg(msg)
 
     def debug(self,msg):
-        #print msg
-        pass
+        self.log(msg,'debug')
+        
+    def log(self,msg,severity='info',instance=False):
+        if not instance:
+            instance = "dpt-types"
+        self.WG.log(msg,severity,instance)
 
+
     def toBigInt(self,raw):
         c=0
         res = 0
@@ -212,6 +218,7 @@
     def decodeDPT16(self,raw):
         res = ""
         for char in raw:
+            ## stop on terminating \x00
             if char == 0:
                 break
             res += chr(char)

Modified: PyWireGate/trunk/knx_connector/GroupSocket.py
===================================================================
--- PyWireGate/trunk/knx_connector/GroupSocket.py	2010-11-01 21:14:31 UTC (rev 64)
+++ PyWireGate/trunk/knx_connector/GroupSocket.py	2010-11-03 13:17:57 UTC (rev 65)
@@ -20,11 +20,12 @@
 import time
 
 class groupsocket:
-    def __init__(self, WireGateInstance):
+    def __init__(self, WireGateInstance, connectorInstance):
         self.WG = WireGateInstance
+        self.KNX = connectorInstance
         self.nicehex=lambda x: " ".join(map(lambda y:"%.2x" % y,x))
         self.tobinstr=lambda n,b=8: "".join([str((n >> y) & 1) for y in range(b-1, -1, -1)])
-        self.dpt = DPT_Types.dpt_type()
+        self.dpt = DPT_Types.dpt_type(WireGateInstance)
 
     def decode(self,buf,src,dst):
         ## Accept List Hex or Binary Data
@@ -48,7 +49,7 @@
         msg['srcaddr'] = self._decodePhysicalAddr(src)
         try:
             msg['dstaddr'] = self._decodeGrpAddr(dst)
-            id = "KNX:%s" % msg['dstaddr']
+            id = "%s:%s" % (self.KNX.instanceName, msg['dstaddr'])
             if (buf[0] & 0x3 or (buf[1] & 0xC0) == 0xC0):
                 ##FIXME: unknown APDU
                 self.debug("unknown APDU from "+msg['srcaddr']+" to "+msg['dstaddr']+ " raw:"+buf)
@@ -78,13 +79,9 @@
         return msg
 
 
-    def errormsg(self,msg=''):
-        f=open("/tmp/WGerror","a+")
-        __import__('traceback').print_exc(file=f)
-        f.write(time.asctime())
-        f.write("MSG:"+repr(msg))
-        f.close()
-
+    def errormsg(self,msg=False):
+        ## central error handling
+        self.WG.errorlog(msg)
         
     def _decodePhysicalAddr(self,raw):
         return "%d.%d.%d" % ((raw >> 12) & 0x0f, (raw >> 8) & 0x0f, (raw) & 0xff)
@@ -93,7 +90,7 @@
         return "%d/%d/%d" % ((raw >> 11) & 0x1f, (raw >> 8) & 0x07, (raw) & 0xff)
         
     def debug(self,msg):
-        print "DEBUG: GROUPSOCKET: "+ repr(msg) 
+        #print "DEBUG: GROUPSOCKET: "+ repr(msg) 
         pass
 
 

Modified: PyWireGate/trunk/knx_connector/KNX_Connector.py
===================================================================
--- PyWireGate/trunk/knx_connector/KNX_Connector.py	2010-11-01 21:14:31 UTC (rev 64)
+++ PyWireGate/trunk/knx_connector/KNX_Connector.py	2010-11-03 13:17:57 UTC (rev 65)
@@ -35,8 +35,8 @@
         self.KNXBuffer = EIBConnection.EIBBuffer()
         self.KNXSrc = EIBConnection.EIBAddr()
         self.KNXDst = EIBConnection.EIBAddr()
-        self.busmon = BusMonitor.busmonitor(WireGateInstance)
-        self.groupsocket = GroupSocket.groupsocket(WireGateInstance)
+        self.busmon = BusMonitor.busmonitor(WireGateInstance,self)
+        self.groupsocket = GroupSocket.groupsocket(WireGateInstance,self)
         
         ## Deafaultconfig
         defaultconfig = {
@@ -82,7 +82,7 @@
     def _run(self):
         while self.isrunning:
             ## Check if we are alive and responde until 10 secs
-            self.WG.watchdog("knx_connector",10)
+            self.WG.watchdog(self.instanceName,10)
             try:
                 vbusmonin, vbusmonout, vbusmonerr = select.select([self.KNX.EIB_Poll_FD()],[],[],1)
             except:
@@ -114,3 +114,7 @@
                         if len(self.KNXBuffer.buffer) > 7 :
                             self.busmon.decode(self.KNXBuffer.buffer)
                 
+
+
+    def send(self,dsobj):
+        print "SEND to %s" % dsobj.name
\ No newline at end of file

Modified: PyWireGate/trunk/owfs_connector/OWFS_Connector.py
===================================================================
--- PyWireGate/trunk/owfs_connector/OWFS_Connector.py	2010-11-01 21:14:31 UTC (rev 64)
+++ PyWireGate/trunk/owfs_connector/OWFS_Connector.py	2010-11-03 13:17:57 UTC (rev 65)
@@ -172,7 +172,7 @@
             ## loop through their interfaces
             for get in self.busmaster[busname]['sensors'][sensor]['interfaces']:
                 resolution = ""
-                id = "OW:"+sensor+"_"+get
+                id = "%s:%s_%s" % (self.instanceName,sensor,get)
 
                 ## get the Datastore Object and look for config
                 obj = self.WG.DATASTORE.get(id)
@@ -205,4 +205,3 @@
                     threadname = "OWFS-Reader_%s" % busname
                     self.busmaster[busname]['readthread'] = threading.Thread(target=self._read,args=[busname],name=threadname)
                     self.busmaster[busname]['readthread'].start()
-                
\ No newline at end of file

Modified: PyWireGate/trunk/owfs_connector/connection.py
===================================================================
--- PyWireGate/trunk/owfs_connector/connection.py	2010-11-01 21:14:31 UTC (rev 64)
+++ PyWireGate/trunk/owfs_connector/connection.py	2010-11-03 13:17:57 UTC (rev 65)
@@ -88,6 +88,7 @@
 
         self._server = server
         self._port   = port
+        self.checknum = re.compile(r"(^\d+$)|(^\d+\x2e\d+$)", re.MULTILINE)
 
 
     def __str__(self):
@@ -121,91 +122,120 @@
         """
         """
 
-        #print 'Connection.read("%s", %i, "%s")' % (path)
-        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        s.connect((self._server, self._port))
+        #print 'Connection.read("%s")' % (path)
+        
+        rtn = None
+        ## we don't want errors
+        try:
+            s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            try:
+                s.connect((self._server, self._port))
+            except:
+                ##
+                return rtn
 
-        smsg = self.pack(OWMsg.read, len(path) + 1, 8192)
-        s.sendall(smsg)
-        s.sendall(path + '\x00')
+            smsg = self.pack(OWMsg.read, len(path) + 1, 8192)
+            s.sendall(smsg)
+            s.sendall(path + '\x00')
 
-        while 1:
-            data = s.recv(24)
+            while 1:
+                try:
+                    data = s.recv(24)
+                except:
+                    ##
+                    return rtn
 
-            if len(data) is not 24:
-                raise exShortRead
+                payload_len = -1
+                if len(data) is  24:
+                    ret, payload_len, data_len = self.unpack(data)
 
-            ret, payload_len, data_len = self.unpack(data)
+                if payload_len >= 0:
+                    data = s.recv(payload_len)
+                    return self.toNumber(data[:data_len])
+                    break
+                else:
+                    # ping response
+                    return None
 
-            if payload_len >= 0:
-                data = s.recv(payload_len)
-                rtn = self.toNumber(data[:data_len])
-                break
-            else:
-                # ping response
-                rtn = None
-                break
+        finally:
+            s.close()
+            
 
-        s.close()
-        return rtn
 
-
     def write(self, path, value):
         """
         """
+        ret = None
+        try:
+            #print 'Connection.write("%s", "%s")' % (path, str(value))
+            s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            try:
+                s.connect((self._server, self._port))
+            except:
+                return ret
 
-        #print 'Connection.write("%s", "%s")' % (path, str(value))
-        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        s.connect((self._server, self._port))
+            value = str(value)
+            smsg = self.pack(OWMsg.write, len(path) + 1 + len(value) + 1, len(value) + 1)
+            s.sendall(smsg)
+            s.sendall(path + '\...
 
[truncated message content]

Thread: [Openautomation-svn] SF.net SVN: openautomation:[65] PyWireGate/trunk

Building automation (like KNX or OpenHAB) software (like CometVisu).

openautomation-svn