summaryrefslogtreecommitdiff
path: root/eventStreamer
diff options
context:
space:
mode:
Diffstat (limited to 'eventStreamer')
-rwxr-xr-xeventStreamer/eventStreamer.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/eventStreamer/eventStreamer.py b/eventStreamer/eventStreamer.py
index ca64542..d35bcd8 100755
--- a/eventStreamer/eventStreamer.py
+++ b/eventStreamer/eventStreamer.py
@@ -27,7 +27,7 @@ devices={}
def sendevent(e):
#send all data in each event to avoid translation script having a state
print str(e[3]),devices[e[3]]['IMSI'],devices[e[3]]['IMEI'],devices[e[3]]['number'],str(e[1])
- outsock.sendto( devices[e[3]]['IMSI']+","+devices[e[3]]['IMEI']+","+devices[e[3]]['number']+","+str(e[1]), (config.viz_ip, config.viz_port) )
+ outsock.sendto( devices[e[3]]['IMSI']+"^"+devices[e[3]]['IMEI']+"^"+devices[e[3]]['number']+"^"+str(e[1]), (config.viz_ip, config.viz_port) )
def main():
@@ -124,15 +124,15 @@ def main():
if not devices.has_key(results[0][3]):
sql = "SELECT * FROM IMSIs Where id = "+str(results[0][3])
try:
- cursor.execute(sql)
- imresults = cursor.fetchall()
- for row in imresults:
- d={}
- d['IMSI']=row[1]
- d['number']=row[2]
- d['ts']=row[3]
- devices[row[0]]=d
- print "new IMSI: ",d['IMSI']
+ cursor.execute(sql)
+ imresults = cursor.fetchall()
+ for row in imresults:
+ d={}
+ d['IMSI']=row[1]
+ d['IMEI']=row[2]
+ d['number']=row[3]
+ devices[row[0]]=d
+ print "new IMSI: ",d['IMSI']
except:
print "Error: unable to fetch event handset"
exit()