X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Extractor%2FExtractorScript.py;h=9437601d412579ff8abcf726dcf52128248f5233;hb=6efe7033d936fc2dfe452bca10769e96c220a5c0;hp=350bdee428c2cef4d233986bf28575a3b490a427;hpb=3f6803e106343cf2acdb7ebd80a36cbcc98672dd;p=smartthings-infrastructure.git

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index 350bdee..9437601 100644
--- 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,
@@ -213,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]
@@ -304,6 +306,7 @@ def CountEvents():
 	global eventList
 	numOfActualEvents = 0
 	#print "DEBUG: eventlist: %d" % len(eventList)
+	#print "DEBUG: eventlist: %s" % eventList
 	for event in eventList:
 		#print "DEBUG: Event: %s %d" % (event, eventTypeCounterMap[event])
 		numOfActualEvents = numOfActualEvents + eventTypeCounterMap[event]
@@ -330,6 +333,7 @@ def ExtractEvents(extractedEvents):
 	#print "DEBUG: App1: %d" % indexApp1
 	#print "DEBUG: App2: %d" % indexApp2
 	#print "DEBUG: eventList: %d" % len(eventList)
+	#print eventList
 	isApp1 = True
 	while counter < numOfActualEvents:
 		# Interleave events from App1 and App2
@@ -358,9 +362,6 @@ def ExtractEvents(extractedEvents):
 			for line in event:
 				extractedEvents.write(line)
 			event.close()
-		elif eventList[i] == "unlock":
-			#Don't do anything for this case
-			counter = counter - 1
 		elif eventList[i] == "nfcTouch":
 			event = open("eventSimulator/nfcTouchEvent.groovy", "r")
 			for line in event:
@@ -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()