added stale

Author: naman108

TAKfreeServer/Controllers/RequestCOTController.py

@@ -18,12 +18,13 @@
 class RequestCOTController:
     """this controller manage all the different types of COTS, including the geochat
     """
-# default constructor  
+    
+    # default constructor  
     def __init__(self):  
         pass
 
-    def timeout(self, lat="00.00000000", lon='00.00000000', le = "9999999.0", ce = "9999999.0", hae = "00.00000000", linkuid='abc', linktype='a-f-G-U-C', linkrelation='p-p'):
-       event = Event(eventType = 'timeout',eventconnType = 'timeout',linkType='timeout' ,pointlat=lat, pointlon=lon, pointle=le, pointce=ce, pointhae=hae, linkuid=linkuid, linktype=linktype, linkrelation=linkrelation) 
+    def timeout(self, lat="00.00000000", lon='00.00000000', le = "9999999.0", ce = "9999999.0", hae = "00.00000000", linkuid='abc', linktype='a-f-G-U-C', linkrelation='p-p', eventhow ='h-g-i-g-o', eventuid = None):
+       event = Event(eventhow = eventhow, eventuid = eventuid,eventType = 'timeout',eventconnType = 'timeout',linkType='timeout' ,pointlat=lat, pointlon=lon, pointle=le, pointce=ce, pointhae=hae, linkuid=linkuid, linktype=linktype, linkrelation=linkrelation) 
        return event
 
     def ping(self, lat="00.00000000", lon='00.00000000', le = "9999999.0", ce = "9999999.0", hae = "00.00000000"):
@@ -33,4 +34,3 @@ def ping(self, lat="00.00000000", lon='00.00000000', le = "9999999.0", ce = "999
     def chat(self, lat="00.00000000", lon='00.00000000', le = "9999999.0", ce = "9999999.0", hae = "00.00000000",isChat = 1,chatType = None, senderCallsign = None, chatroom = None, groupOwner = None, id = None, parent = None, uid0 = None, uid1 = None):
         event = Event(connType = 'chat', chatType = chatType, senderCallsign = senderCallsign, chatroom = chatroom, groupOwner = groupOwner, id = id, parent = parent, uid0 = uid0, uid1 = uid1, chatgrpid = chatgrpid, lat=lat, lon=lon, le=le, ce=ce, hae=hae)
         return event
-RequestCOTController().ping()

TAKfreeServer/Controllers/serializer.py

@@ -1,8 +1,7 @@
 import xml.etree.ElementTree as et
-from Controllers.RequestCOTController import RequestCOTController
 class Serializer:
     def __init__(self):
-        self.xmlheader = "<?xml version='1.0' encoding='UTF-8' standalone='yes'?>"
+        self.xmlheader = '<?xml version="1.0" encoding="UTF-8" standalone="true"?>'
 
     def serializerRoot(self, object):
         root = et.Element('event')

TAKfreeServer/Model/Event.py

@@ -15,8 +15,6 @@ class Event:
 
         #default constructor
     def __init__(self, linkType=None, linkuid = None, linkproduction_time=None, linkrelation=None, linktype=None, linkparent_callsign=None, eventType = 'default', eventisPing = 0 ,eventtype = "a-f-G-I" , eventhow = 'm-g' ,eventisGeochat = 0 ,eventDATETIME_FMT = "%Y-%m-%dT%H:%M:%SZ", eventuid = "UIDString", eventversion = '2.0', eventconnType=None, pointlat="00.00000000", pointlon='00.00000000', pointle = "9999999.0", pointce = "9999999.0", pointhae = "00.00000000", chatType = None, chatsenderCallsign = None, chatchatroom = None, chatgroupOwner = None,chatid = None, chatparent = None ,chatgrpid = None ,chatgrpuid0 = None, chatgrpuid1 = None):
-        
-        
 
         from Model.detail import Detail
         from Model.point import Point
@@ -29,13 +27,7 @@ def __init__(self, linkType=None, linkuid = None, linkproduction_time=None, link
 
             }
 
-        self.version = eventversion
-
-        self.uid = eventuid
-
         DATETIME_FMT = eventDATETIME_FMT
-
-        self.type = eventtype
         # flag to determin e if this event is a geo chcat if so, will be added as a
         # prefix to the uid
 
@@ -63,46 +55,49 @@ def __init__(self, linkType=None, linkuid = None, linkproduction_time=None, link
         # flag to determine if this event is a Ping, in this case append to the UID
 
 
-        self.setuid(isGeochat = eventisGeochat, isPing = eventisPing)
-        
-        self.how = eventhow
+
         #calls detail and point
         self.point = Point(lat=pointlat, lon=pointlon, le=pointle, ce=pointce, hae=pointhae)
         self.detail = Detail(connType=eventconnType,linkuid=linkuid ,linkType=linkType, uid = eventuid, linkproduction_time=linkproduction_time, linkrelation=linkrelation, linktype=linktype, linkparent_callsign=linkparent_callsign, chatType = chatType, chatsenderCallsign = chatsenderCallsign, chatchatroom = chatchatroom, chatgroupOwner = chatgroupOwner, chatid = chatid, chatparent = chatparent, chatgrpuid0 = chatgrpuid0, chatgrpuid1 = chatgrpuid1)
 
-        case[eventType](DATETIME_FMT)
+        case[eventType](DATETIME_FMT,version = eventversion, uid = eventuid, how = eventhow, type = eventtype,isGeochat = eventisGeochat, isPing = eventisPing)
+
+    def defaultFunc(self, DATETIME_FMT,  version, uid, type, how, isGeochat, isPing):
+        self.how = how
 
-    def defaultFunc(self, DATETIME_FMT):
         timer = dt.datetime
         now = timer.utcnow()
         zulu = now.strftime(DATETIME_FMT)
-        
-        self.settime(zulu)
-        self.setstart(zulu)
         stale_part = dt.datetime.strptime(zulu, DATETIME_FMT) + dt.timedelta(minutes = 1)
         stale_part = stale_part.strftime(DATETIME_FMT)
         self.setstale(str(stale_part))
+        self.setstart(zulu)
+        self.settime(zulu)
+        self.type = type
+        self.setuid(isGeochat = isGeochat, isPing=isPing)
+        self.version = version
+
+    def timeoutFunc(self, DATETIME_FMT, version, uid, type, how, isGeochat, isPing):
+        self.how = how
 
-    def timeoutFunc(self, DATETIME_FMT):
         timer = dt.datetime
         now = timer.utcnow()
         zulu = now.strftime(DATETIME_FMT)
-        
-        self.settime(zulu)
         stale_part = dt.datetime.strptime(zulu, DATETIME_FMT) - dt.timedelta(minutes = 1)
         stale_part = stale_part.strftime(DATETIME_FMT)
-        self.setstart(stale_part)
         self.setstale(str(stale_part))
-        self.how = 'h-g-i-g-o'
-        self.type = 't-x-d-d'
-
+        self.setstart(zulu)
+        self.settime(zulu)
+        self.type = type
+        self.setuid(isGeochat = isGeochat, isPing=isPing)
+        self.version = version
         #Start getter
     def getstart(self): 
         return self.Start 
 
         # Start setter
     def setstart(self, Start=0):  
-        self.Start = Start 
+        self.start = Start 
 
         # m_point setter
     def setpoint(self, m_point=0):  

TAKfreeServer/Model/link.py

@@ -34,12 +34,11 @@ def createArguments(self, argumentsRecieved):
                 pass
         return argumentsToBePassed
     def timeoutFunc(self, args):
+        self.settype('a-f-G-U-C')
 
         self.setuid(args['linkuid'])
 
-        self.settype(args['linktype'])
-
-        self.setrelation(args['linkrelation'])
+        self.setrelation('p-p')
 
     # uid getter 
     def getuid(self): 

TAKfreeServer/Model/point.py

@@ -12,11 +12,11 @@
 class Point:
 
     def __init__(self, lat="00.00000000", lon='00.00000000', le = "9999999.0", ce = "9999999.0", hae = "00.00000000"):
-        self.lat = lat
-        self.lon = lon
         self.le = le
         self.ce = ce
         self.hae = hae
+        self.lon = lon        
+        self.lat = lat
         pass
 
 

TAKfreeServer/server.py

@@ -23,8 +23,8 @@
 import xml.etree.ElementTree as ET
 import TAKWinService.constants as constants
 import logging
-from Controllers.serializer import Serializer
 from Controllers.RequestCOTController import RequestCOTController
+from Controllers.serializer import Serializer
 import multiprocessing as multi
 const = constants.vars()
 ''' Server class '''
@@ -187,6 +187,7 @@ def listenToClient(self, client, address):
 		Function to receive data from the client. this must be long as everything
 		'''
 		defaults = self.connectionSetup(client, address)
+		print(defaults)
 		defaults = defaults.split(' ? ')
 		print(defaults)
 		first_run=defaults[0]
@@ -210,13 +211,17 @@ def listenToClient(self, client, address):
 					#checking if check_xml detected client disconnect
 					if working == const.FAIL:
 						print('here')
-						timeoutInfo = Serializer().serializerRoot(RequestCOTController().timeout(linkuid = self.client_dict[current_id]['uid']))
+						timeoutInfo = Serializer().serializerRoot(RequestCOTController().timeout(eventhow = 'h-g-i-g-o', eventuid = 'aef53602-ea19-4a82-a07b-f0069470b23d', linkuid = self.client_dict[current_id]['uid']))
+						print(timeoutInfo.encode())
+						logging.debug(timeoutInfo.encode())
+						logging.debug('timeout info is with utf8 '+str(timeoutInfo))
+						logging.debug('timeout info is with ascii '+str(bytes(timeoutInfo, 'utf-8')))
 						if len(self.client_dict)>0:
 
 							for x in self.client_dict:
 
 								if x != current_id:
-									print(self.client_dict[x]['client'])
+									logging.debug('sending timeout to '+str(self.client_dict[x]['client']))
 									self.client_dict[x]['client'].send(timeoutInfo.encode())
 
 								else: