Adding cases for app and location.

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index 612105278856cd672ab6375960a415fd77322848..c96daa799d2d8358fd3a546a3647b0b8d68c06c1 100644 (file)
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -88,7 +88,15 @@ def ExtractFunctions(F, appName):
                                Temp = GetToken(F)
                        if Temp == "\"":
                                Temp = GetToken(F)
-                       if capabilityMap[variable] not in capabilityList:
+                       #print "DEBUG: %s" % variable
+                       #print capabilityMap
+                       #print eventList
+                       #if variable == "app" or variable == "location":
+                               
+                       if Temp == "app" or Temp == "location":
+                               if Temp not in eventList:
+                                       eventList.append(Temp)
+                       elif variable in capabilityMap.keys() and capabilityMap[variable] not in capabilityList:
                                # We do not repeat the same capability twice
                                capability = capabilityMap[variable]
                                capabilityList.append(capability)