projects
/
smartthings-infrastructure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6b2556e
)
Fixing a bug: missing a closing parenthesis.
author
rtrimana
<rtrimana@uci.edu>
Thu, 1 Aug 2019 23:16:36 +0000
(16:16 -0700)
committer
rtrimana
<rtrimana@uci.edu>
Thu, 1 Aug 2019 23:16:36 +0000
(16:16 -0700)
Extractor/ExtractorScript.py
patch
|
blob
|
history
diff --git
a/Extractor/ExtractorScript.py
b/Extractor/ExtractorScript.py
index 4bc7306906652c200f9858ff55487390389883b0..3567349fa4f5c5f0fa32e83b038b53de118d950e 100644
(file)
--- a/
Extractor/ExtractorScript.py
+++ b/
Extractor/ExtractorScript.py
@@
-89,8
+89,8
@@
def ExtractFunctions(F, appName):
if Temp == "\"":
Temp = GetToken(F)
if Temp == "\"":
Temp = GetToken(F)
- print "DEBUG: %s - %s" % (variable, Temp)
- print capabilityMap
+
#
print "DEBUG: %s - %s" % (variable, Temp)
+
#
print capabilityMap
if Temp == "app" or Temp == "location":
if Temp not in eventList:
eventList.append(Temp)
if Temp == "app" or Temp == "location":
if Temp not in eventList:
eventList.append(Temp)
@@
-298,6
+298,7
@@
def ExtractEvents(extractedEvents):
for line in event:
extractedEvents.write("\t\t" + line)
event.close()
for line in event:
extractedEvents.write("\t\t" + line)
event.close()
+ extractedEvents.write("\t\t\t}\n")
elif eventList[i] == "presence.present": #Case for Touched event
event = open("eventSimulator/presencePresencePresentEvent.groovy", "r")
for line in event:
elif eventList[i] == "presence.present": #Case for Touched event
event = open("eventSimulator/presencePresencePresentEvent.groovy", "r")
for line in event:
@@
-413,6
+414,15
@@
def ExtractEvents(extractedEvents):
event.close()
extractedEvents.write("\t\t\t}\n")
elif eventList[i] == "carbonMonoxide.clear":
event.close()
extractedEvents.write("\t\t\t}\n")
elif eventList[i] == "carbonMonoxide.clear":
+ #Check which capability
+ variable = eventVarMap[eventList[i]]
+ if eventList[i] not in eventVarCounterMap.keys():
+ eventVarCounterMap[eventList[i]] = 1
+ eventVarCount = 0
+ else:
+ eventVarCount = eventVarCounterMap[eventList[i]]
+ eventVarCounterMap[eventList[i]] = eventVarCount + 1
+ capability = capabilityMap[variable[eventVarCount]]
if capability == "capability.smokeDetector":
event = open("eventSimulator/smokeCarbonMonoxideDefaultClearEvent.groovy", "r")
elif capability == "capability.carbonMonoxideDetector":
if capability == "capability.smokeDetector":
event = open("eventSimulator/smokeCarbonMonoxideDefaultClearEvent.groovy", "r")
elif capability == "capability.carbonMonoxideDetector":
@@
-421,6
+431,15
@@
def ExtractEvents(extractedEvents):
extractedEvents.write("\t\t" + line)
event.close()
elif eventList[i] == "carbonMonoxide.detected":
extractedEvents.write("\t\t" + line)
event.close()
elif eventList[i] == "carbonMonoxide.detected":
+ #Check which capability
+ variable = eventVarMap[eventList[i]]
+ if eventList[i] not in eventVarCounterMap.keys():
+ eventVarCounterMap[eventList[i]] = 1
+ eventVarCount = 0
+ else:
+ eventVarCount = eventVarCounterMap[eventList[i]]
+ eventVarCounterMap[eventList[i]] = eventVarCount + 1
+ capability = capabilityMap[variable[eventVarCount]]
if capability == "capability.smokeDetector":
event = open("eventSimulator/smokeCarbonMonoxideDefaultDetectedEvent.groovy", "r")
elif capability == "capability.carbonMonoxideDetector":
if capability == "capability.smokeDetector":
event = open("eventSimulator/smokeCarbonMonoxideDefaultDetectedEvent.groovy", "r")
elif capability == "capability.carbonMonoxideDetector":
@@
-429,6
+448,15
@@
def ExtractEvents(extractedEvents):
extractedEvents.write("\t\t" + line)
event.close()
elif eventList[i] == "carbonMonoxide.tested":
extractedEvents.write("\t\t" + line)
event.close()
elif eventList[i] == "carbonMonoxide.tested":
+ #Check which capability
+ variable = eventVarMap[eventList[i]]
+ if eventList[i] not in eventVarCounterMap.keys():
+ eventVarCounterMap[eventList[i]] = 1
+ eventVarCount = 0
+ else:
+ eventVarCount = eventVarCounterMap[eventList[i]]
+ eventVarCounterMap[eventList[i]] = eventVarCount + 1
+ capability = capabilityMap[variable[eventVarCount]]
if capability == "capability.smokeDetector":
event = open("eventSimulator/smokeCarbonMonoxideDefaultTestedEvent.groovy", "r")
elif capability == "capability.carbonMonoxideDetector":
if capability == "capability.smokeDetector":
event = open("eventSimulator/smokeCarbonMonoxideDefaultTestedEvent.groovy", "r")
elif capability == "capability.carbonMonoxideDetector":
@@
-850,7
+878,7
@@
def ExtractEvents(extractedEvents):
event.close()
###TODO: Add more events later
event.close()
###TODO: Add more events later
- extractedEvents.write("\t\t\tbreak\n")
+ extractedEvents.write("\
n\
t\t\tbreak\n")
extractedEvents.write("\t}\n")
extractedEvents.write("}\n")
extractedEvents.write("\t}\n")
extractedEvents.write("}\n")