Changeset 190:75d280708ff5 for StormSiren/StormWeather.py

Timestamp:

11/29/08 00:48:18 (3 years ago)

Author:

cfreeze@…

Branch:

default

Parents:

189:8190540dae37 (diff), 185:c20e85874308 (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:

correct merge problems that are showing up from bad branching

Files:

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

StormSiren/StormWeather.py

@@ -48 +48 @@
 from WeatherAlert import *
 from XmlWeather import *
-from CAP import CAP
 
 class StormWeather(XmlWeather):
-        def __init__(self, state, history, simfetch = False, simalert = False):
-                super(StormWeather,self).__init__(state,history,simfetch)
+        def __init__(self, state, history, simfetch = False, simalert = False, proxy = None):
+                super(StormWeather,self).__init__(state,simfetch,proxy)
                 self.log = logging.getLogger("StormWeather")
                 self.__alert_devs = []
                 self.__simalert = simalert
+                self.__history = history
 
                 self.log.setLevel(logging.INFO)
         
-        def display(self):
-                return self.__str__()
-
         def __str__(self):
                 str  = "StormWeather: " + "\n"
@@ -72 +69 @@
                 return str
 
-        def display(self):
-                print self.__str__()
-
         def registerDevice(self, dev):
                 self.log.debug("Registering Device")
                 self.__alert_devs.append(dev)
 
-        def handleAlert(self, cap_item):
-                alerted = False
+        def logAtomShort(self, cap_atom):
+                self.log.info("---------CAP ATOM---------")
+                for l in (cap_atom.__str__().split('\n')):
+                        self.log.info(l)
+                self.log.info("---------CAP ATOM---------")
 
-                for dev in self.__alert_devs:
-                        if(dev.isAlertWanted(cap_item)):
-                                if(not self.__simalert):
-                                        dev.send(WeatherAlert(cap_item))
-                                        alerted = True
-                                else:
-                                        self.log.info("Simulated Alert on: %s" % cap_item.id)
+        def logAtomFull(self, cap_atom):
+                self.log.info("---------CAP ATOM---------")
+                for l in (cap_atom.__str__().split('\n')):
+                        self.log.info(l)
+                self.log.info("========DESCRIPTION=======")
+                if(cap_atom.description):
+                        for l in (cap_atom.description.split('\n')):
+                                self.log.info(l)
+                self.log.info("========DESCRIPTION=======")
+                self.log.info("---------CAP ATOM---------")
 
-                return alerted
+        def handleAtom(self, cap_atom):
+                self.logAtomShort(cap_atom)
+                if(not self.__history.exists(cap_atom.id)):
+                        for dev in self.__alert_devs:
+                                if(dev.isAlertWanted(cap_atom)):
+                                        if(not self.__simalert):
+                                                cap_atom.expand(self.simfetch,self.proxy)
+                                                self.logAtomFull(cap_atom)
+                                                dev.send(cap_atom)
+                                                self.__history.add(cap_atom.id)
+                                        else:
+                                                self.log.info("Simulated Alert on: %s" % cap_atom.id)
+                else:
+                        self.log.debug("Ignoring %s: Already alerted on" % cap_atom.id)