X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Extractor%2FExtractorScript.py;h=8a888fcf194c6a5ba7364b16e0997606bbab261b;hb=893b77f97aee54e538df5c5114983637722e7490;hp=f972b70f78763701106c05be19fd7f7ffd28b5ac;hpb=4e6463b38690279fa3ea38f4d8ef09827d8d6b09;p=smartthings-infrastructure.git

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index f972b70..8a888fc 100644
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -47,7 +47,7 @@ eventTypeCounterMap =  {'lock': 2,
 						'saturation' : 1,
 						'energy' : 1,
 						'power' : 2,
-						'illuminance' : 1,
+						'illuminance' : 2,
 						'humidity' : 2,
 						'alarm' : 4,
 						'contact' : 2,
@@ -60,7 +60,7 @@ eventTypeCounterMap =  {'lock': 2,
 						'heatingSetpoint' : 1,
 						'coolingSetpoint' : 1,
 						'thermostatSetpoint' : 1,
-                                                'threeAxis' : 1}
+						'threeAxis' : 1}
 
 # Mapping for specific event types
 eventTypesMap =  	   {'alarm.both': 'alarm',
@@ -825,7 +825,14 @@ def ExtractEvents(extractedEvents):
 				extractedEvents.write(line)
 			event.close()
 		elif eventList[i] == "illuminance":
-			event = open("eventSimulator/illuminanceMeasurementEvent.groovy", "r")
+			event = open("eventSimulator/illuminanceMeasurementLowEvent.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/illuminanceMeasurementHighEvent.groovy", "r")
 			for line in event:
 				extractedEvents.write(line)
 			event.close()