Fixing a bug in Locks group: we have to change the state of the device before sending...

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index f89c9ea42c62dc7fdcdd1059117e7c379069e43d..fc06799f4266f54c3d7a1feffa058a776ddde6d5 100644 (file)
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -227,10 +227,7 @@ 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")

diff --git a/Lock/Locks.groovy b/Lock/Locks.groovy
index 8ebf46b8aff74d91e5777a5bda9c371513866945..951020f106508ab90eb94454258cfd3382c60ef4 100644 (file)
--- a/Lock/Locks.groovy
+++ b/Lock/Locks.groovy
@@ -25,44 +25,44 @@ public class Locks{
                this.deviceNumbers = deviceNumbers
                this.locks = []
 
-               /*def init = Verify.getBoolean()
+               def init = Verify.getBoolean()
                if (init) {
                        this.lockState = "locked"
                        this.lockLatestValue = "locked"
                } else {
                        this.lockState = "unlocked"
                        this.lockLatestValue = "unlocked"
-               }*/
+               }
                locks.add(new Lock(sendEvent,id, label, displayName, this.lockState, this.lockLatestValue))
        }
 
        //By Apps
        def lock() {
                if (lockState != "locked") {
-                       locks[0].lock()
                        lockLatestValue = lockState
                        lockState = "locked"
                        currentLock = "locked"
+                       locks[0].lock()
                }
        }
 
        def lock(LinkedHashMap metaData) {
                if (lockState != "locked") {
                        def task = timers.runAfter(metaData["delay"]) {
-                               locks[0].lock()
                                lockLatestValue = lockState
                                lockState = "locked"
                                currentLock = "locked"
+                               locks[0].lock()
                        }
                }
        }
 
        def unlock() {
                if (lockState != "unlocked") {
-                       locks[0].unlock()
                        lockLatestValue = lockState
                        lockState = "unlocked"
                        currentLock = "unlocked"
+                       locks[0].unlock()
                }
        }
 
@@ -70,10 +70,10 @@ public class Locks{
        def unlock(LinkedHashMap metaData) {
                if (lockState != "unlocked") {
                        def task = timers.runAfter(metaData["delay"]) {
-                               locks[0].unlock()
                                lockLatestValue = lockState
                                lockState = "unlocked"
                                currentLock = "unlocked"
+                               locks[0].unlock()
                        }
                }
        }