Changeset 187:b82b5be8e615 for StormSiren/AlertDevice.py

Timestamp:

11/28/08 18:18:12 (3 years ago)

Author:

chris@…

Branch:

default

Parents:

186:fdaf10ceded4 (diff), 183:1e15754ebd2a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

moving the CAP 1.1 work in the default branch

Files:

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

StormSiren/AlertDevice.py

@@ -59 +59 @@
                 self.log = logging.getLogger('AlertDevice')
 
+                self.log.setLevel(logging.INFO)
                 self.__parse_weather_types(alerts)
                 self.__parse_areas(areas)

StormSiren/AlertDevice.py

@@ -136 +136 @@
                 return False
 
-        def isCountyWanted(self,state,county):
+        def isAreaWanted(self,state,alert_areas):
                 if(self.__areas.has_key(state)):
-                        if(county.lower() in self.__areas[state]):
-                                return True
+                        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
 
@@ -146 +149 @@
                 if(self.isTypeWanted(cap_alert.type) and self.isStateWanted(cap_alert.state)):
                         self.log.debug("Testing[%s]: type and state match(%s/%i)" % (cap_alert.id, cap_alert.state, cap_alert.type))
-                        if(self.isCountyWanted(cap_alert.state, cap_alert.county)):
-                                self.log.info("Alert hit on county[%s/%s]: %s" % (cap_alert.county, cap_alert.state, cap_alert.id))
+                        if(self.isAreaWanted(cap_alert.state, cap_alert.areas)):
+                                self.log.debug("Alert hit on area[%s/%s]: %s" % (cap_alert.state, cap_alert.id, cap_alert.areas))
                                 return True
                         else:
-                                for loc in self.__areas[cap_alert.state]:
-                                        if(cap_alert.isLocationInDesc(loc)):
-                                                self.log.info("Alert hit on location[%s/%s]: %s" % (loc, cap_alert.state, cap_alert.id))
-                                                return True
+                                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