Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure

[smartthings-infrastructure.git] / Extractor / ExtractorScript.py

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index 1172b4e392a6d987c1ea764a0a74109fb268e9fd..9437601d412579ff8abcf726dcf52128248f5233 100644 (file)
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -15,7 +15,6 @@ app2Subscribe = False
 # Mapping for event type and number of events
 # e.g., switch has 2 events: on and off
 eventTypeCounterMap =  {'lock': 2,
-                                               'unlock' : 1,
                                                'nfcTouch' : 1,
                                                'app' : 1,
                                                'button' : 2,
@@ -76,7 +75,6 @@ eventTypesMap =          {'alarm.both': 'alarm',
                                                'mode.away' : 'location',
                                                'mode.home' : 'location',
                                                'mode.night' : 'location',
-                                               'unlock' : 'lock',
                                                'lock.locked' : 'lock',
                                                'lock.unlocked' : 'lock',
                                                'motion.active' : 'motion',
@@ -214,7 +212,10 @@ def ExtractFunctions(F, appName):
                        #print "DEBUG: %s - %s" % (variable, Temp)
                        #print capabilityMap
                        #print "DEBUG: location variable: %s" % Temp    
-                       
+
+                        #This is a bogus event, just skip it...
+                        if Temp == "unlock":
+                                continue                        
                        #Translate and reduce through mapping
                        if Temp in eventTypesMap.keys():                
                                Temp = eventTypesMap[Temp]
@@ -795,7 +796,15 @@ def ExtractEvents(extractedEvents):
                                extractedEvents.write(line)
                        event.close()
                elif eventList[i] == "power":
-                       event = open("eventSimulator/powerMeterEvent.groovy", "r")
+                       #Write two events subsequently
+                       event = open("eventSimulator/powerMeterHighPowerEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
+                       extractedEvents.write("\n\t\t\tbreak\n")
+                       counter = counter + 1
+                       extractedEvents.write("\t\tcase %d:\n" % counter)
+                       event = open("eventSimulator/powerMeterLowPowerEvent.groovy", "r")
                        for line in event:
                                extractedEvents.write(line)
                        event.close()