drawing calls and sms

1 files changed, 12 insertions, 4 deletions

diff --git a/eventStreamer/eventStreamer.py b/eventStreamer/eventStreamer.py
index c6f9f1f..ca64542 100755
--- a/eventStreamer/eventStreamer.py
+++ b/eventStreamer/eventStreamer.py
@@ -1,4 +1,11 @@
 #!/usr/bin/python
+#
+#Translates openBTS logs into UDP event packets.
+#
+#http://openhere.data.ie/
+#
+#TJR June 2012
+#
 
 import MySQLdb,datetime,string,time,socket
 import config
@@ -18,8 +25,9 @@ outsock = socket.socket( socket.AF_INET,socket.SOCK_DGRAM )
 devices={}
 
 def sendevent(e):
-	print str(e[3]),str(e[1]),devices[e[3]]['IMSI']
-	outsock.sendto( devices[e[3]]['IMSI']+","+str(e[1]), (config.viz_ip, config.viz_port) )
+	#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) )
 	
 def main():
 
@@ -53,8 +61,8 @@ def main():
 	   for row in results:
 		d={}
 		d['IMSI']=row[1]
-		d['number']=row[2]
-		d['ts']=row[3]
+		d['IMEI']=row[2]
+		d['number']=row[3]
 		devices[row[0]]=d
 	except:
 	   print "Error: unable to fetch handset list"