From: rtrimana <rtrimana@uci.edu>
Date: Tue, 30 Jul 2019 21:58:39 +0000 (-0700)
Subject: Fixing a bug with capabilityMap extraction.
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartthings-infrastructure.git;a=commitdiff_plain;h=99635103460e10293e14b7b42116da57af23b4ce

Fixing a bug with capabilityMap extraction.
---

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index 51f753e..f89c9ea 100644
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -62,13 +62,14 @@ def ExtractFunctions(F, appName):
 		
 		#Check input capability
 		if (Temp == "input"):
-			Temp = GetToken(F) #Get '"'
+			while Temp != "\"":
+				Temp = GetToken(F)
 			variable = GetToken(F)
 			Temp = GetToken(F) #Get '"'
 			Temp = GetToken(F) #Get ','
-			Temp = GetToken(F) #Get '"'
-			Temp = GetToken(F) #Get capability...
-			capability = Temp
+			while Temp != "\"":
+				Temp = GetToken(F)
+			capability = GetToken(F)
 			capabilityMap[variable] = capability
 		
 		#Check subscribed events
@@ -226,7 +227,10 @@ def ExtractEvents(extractedEvents):
 			extractedEvents.write("\t\t\t}\n")
 		elif eventList[i] == "presence":
 			#Check which capability
+			print eventVarMap
+			print capabilityMap
 			variable = eventVarMap[eventList[i]]
+			print "DEBUG: %s" % variable
 			capability = capabilityMap[variable]
 			#Write three events subsequently
 			extractedEvents.write("\t\t\tdef event = Verify.getInt(0,2)\n")