Adding presence.present event.

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index c96daa799d2d8358fd3a546a3647b0b8d68c06c1..c37c2b80b1a929733cce28c8c7f31a1109c8fda7 100644 (file)
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -87,16 +87,11 @@ def ExtractFunctions(F, appName):
                        while (Temp != "\"" and Temp != "app" and Temp != "location"):
                                Temp = GetToken(F)
                        if Temp == "\"":
                        while (Temp != "\"" and Temp != "app" and Temp != "location"):
                                Temp = GetToken(F)
                        if Temp == "\"":

-                               Temp = GetToken(F)
-                       #print "DEBUG: %s" % variable
-                       #print capabilityMap
-                       #print eventList
-                       #if variable == "app" or variable == "location":
-                               
+                               Temp = GetToken(F)              

                        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)

-                       elif variable in capabilityMap.keys() and capabilityMap[variable] not in capabilityList:
+                       elif Temp not in eventList or (variable in capabilityMap.keys() and capabilityMap[variable] not in capabilityList):

                                # We do not repeat the same capability twice
                                capability = capabilityMap[variable]
                                capabilityList.append(capability)
                                # We do not repeat the same capability twice
                                capability = capabilityMap[variable]
                                capabilityList.append(capability)


@@ -106,7 +101,10 @@ def ExtractFunctions(F, appName):
                                        listOfEvents.append(variable)
                                else:
                                        eventVarMap[Temp] = [variable]
                                        listOfEvents.append(variable)
                                else:
                                        eventVarMap[Temp] = [variable]

-                                       
+                       #print "DEBUG: %s - %s" % (variable, Temp)
+                       #print capabilityMap
+                       #print eventList
+

                #Check and analyze capabilities for physical interaction
                AnalyzeCapabilities(Temp, appName, F)
 
                #Check and analyze capabilities for physical interaction
                AnalyzeCapabilities(Temp, appName, F)
 


@@ -116,7 +114,6 @@ def ExtractFunctions(F, appName):
        AnalyzePhysicalInteraction(app1Capabilities, app2Capabilities)
        AnalyzePhysicalInteraction(app2Capabilities, app1Capabilities)
 
        AnalyzePhysicalInteraction(app1Capabilities, app2Capabilities)
        AnalyzePhysicalInteraction(app2Capabilities, app1Capabilities)
 

-

 def AnalyzeCapabilities(Temp, appName, F):
                        #Illuminance related
        if (Temp == "capability.switch" or
 def AnalyzeCapabilities(Temp, appName, F):
                        #Illuminance related
        if (Temp == "capability.switch" or


@@ -274,13 +271,11 @@ 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()

-                       if capability == "capability.presenceSensor":
-                               extractedEvents.write("\t\t\t} else {\n")
-                               event = open("eventSimulator/presencePresencePresentEvent.groovy", "r")
-                               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:
+                               extractedEvents.write("\t\t" + line)
+                       event.close()

                elif eventList[i] == "doorState":
                        #Write two events subsequently
                        extractedEvents.write("\t\t\tdef event = Verify.getInt(0,1)\n")
                elif eventList[i] == "doorState":
                        #Write two events subsequently
                        extractedEvents.write("\t\t\tdef event = Verify.getInt(0,1)\n")

diff --git a/eventSimulator/lockLockedEvent.groovy b/eventSimulator/lockLockedEvent.groovy
index 5cf9e4cc595e4695a701e42ba1299aedf9c56c31..e208c90b4a9b9b0a7ad786636f4f8bc5082c1f74 100644 (file)
--- a/eventSimulator/lockLockedEvent.groovy
+++ b/eventSimulator/lockLockedEvent.groovy
@@ -1,2 +1,2 @@
                        lockObject.setValue([name: "lock", value: "locked", deviceId: "lockID0", descriptionText: "",
                        lockObject.setValue([name: "lock", value: "locked", deviceId: "lockID0", descriptionText: "",

-                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
\ No newline at end of file
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])