Changeset 170:25f97cee8ceb for StormSiren/AlertDevice.py

Timestamp:

11/19/08 06:46:52 (3 years ago)

Author:

chris

Branch:

CAP_1.1

Message:

clean spaces out of areas from the CAP atom so that the area matching works again

Files:

• StormSiren/AlertDevice.py (modified) (2 diffs)

StormSiren/AlertDevice.py

@@ -138 +138 @@
                 if(self.__areas.has_key(state)):
                         for area in alert_areas:
+                                self.log.debug("checking if %s is in (%s)" % (area.lower(),self.__areas[state]))
                                 if(area.lower() in self.__areas[state]):
+                                        self.log.debug("%s IS IN (%s)" % (area.lower(),self.__areas[state]))
                                         return True
                 return False
@@ -149 +151 @@
                                 self.log.debug("Alert hit on area[%s/%s]: %s" % (cap_alert.state, cap_alert.id, cap_alert.areas))
                                 return True
+                        else:
+                                self.log.debug("Testing[%s]: alert not in watched area(%s/%s)" % (cap_alert.id, cap_alert.state, cap_alert.areas))
+                else:
+                        self.log.debug("Testing[%s]: Either wrong type or state (%s/%i)" % (cap_alert.id, cap_alert.state, cap_alert.type))
                 return False
 #CODE END