Changeset 174:e1594aa49677

Timestamp:

11/26/08 02:15:03 (3 years ago)

Author:

cfreeze@…

Branch:

CAP_1.1

Message:

more cleanup with the output

Location:

StormSiren

Files:

• CapAlert.py (modified) (1 diff)
• CapAtom.py (modified) (2 diffs)
• StormWeather.py (modified) (1 diff)
• WeatherAlert.py (modified) (2 diffs)
• XmlWeather.py (modified) (2 diffs)

StormSiren/CapAlert.py

@@ -49 +49 @@
 from XmlFetcher import XmlFetcher
 
-class CapAlert:
+class CapAlert(object):
         def __init__(self,url,simfetch,proxy):
                 self.__url              = url

StormSiren/CapAtom.py

@@ -51 +51 @@
 from CapAlert import CapAlert
 
-class CapAtom:
+class CapAtom(object):
         def __init__(self,xml,state):
                 self.log = logging.getLogger("CapAtom")
@@ -241 +241 @@
                 str = "\tId: " + self.id + "\n" + \
                         "\tState: " + self.state + "\n"
-                str += "\tArea: %s\n" % self.__areas
+                str += "\tAreas: %s\n" % self.getAreas()
                 if(self.type != None):
                         str += "\tType: " + WeatherTypes.toString(self.__type) + "\n"

StormSiren/StormWeather.py

@@ -88 +88 @@
                                                 cap_atom.expand(self.simfetch,self.proxy)
                                                 self.logAtom(cap_atom)
-                                                dev.send(WeatherAlert(cap_atom))
+                                                dev.send(cap_atom)
                                                 self.__history.add(cap_atom.id)
                                         else:

StormSiren/WeatherAlert.py

@@ -44 +44 @@
 import textwrap
 import sys
+import string
 import re
 
 from WeatherTypes import WeatherTypes
+from CapAtom import CapAtom
 
-class WeatherAlert(object):
-        def __init__(self,cap_item):
-                self.cap_item = cap_item
-                self.__terse  = cap_item.headline + "\n" + \
-                                                "Expires: " + cap_item.expires + "\n"
-                self.__text = cap_item.headline + "\n\n" + \
-                                                " Issued: " + cap_item.issued + "\n" + \
-                                                "Expires: " + cap_item.expires + "\n"
-                self.__detailed = self.text + "\n\n" + cap_item.description + "\n"
-
-        def __str__(self):
-                return self.detailed
+class WeatherAlert(CapAtom):
+        def __init__(self,xml,state):
+                super(WeatherAlert,self).__init__(xml,state)
 
         def display(self):
@@ -65 +58 @@
 
         def getTerse(self):
-                return self.__terse
+                str = self.headline + "\n"
+                str += "Expires: " + self.expires + "\n"
+                return str
 
         def getText(self):
-                return self.__text
+                str = self.headline + "\n\n"
+                str     += " Issued: " + self.issued + "\n"
+                str += "Expires: " + self.expires + "\n"
+                return str
 
         def getDetailedWithFormat(self, desc_width):
-                return self.text + "\n\n" + textwrap.fill(self.cap_item.description.replace("\n",' '),desc_width) + "\n"
+                return self.text + "\n\n" + textwrap.fill(self.description.replace("\n",' '),desc_width) + "\n"
 
         def getDetailed(self):
-                return self.text + "\n\n" + self.cap_item.description + "\n"
+                return self.text + "\n\n" + self.description + "\n"
 
-        def getEvent(self):
-                return self.cap_item.matter
+        def getAreas(self):
+                str = "("
+                str += string.join(self.areas,',')
+                str += ")"
+                return str
 
-        def getId(self):
-                return self.cap_item.id
-
-        def getType(self):
-                return self.cap_item.type
-
-        def getState(self):
-                return self.cap_item.state
-
-        id = property(getId,None,None)
-        event = property(getEvent,None,None)
-        type = property(getType,None,None)
-        state = property(getState,None,None)
         text = property(getText,None,None)
         terse = property(getTerse,None,None)

StormSiren/XmlWeather.py

@@ -46 +46 @@
 from WeatherTypes import *
 from XmlFetcher import *
-from CapAtom import CapAtom
+from WeatherAlert import WeatherAlert
 
 class XmlWeather(object):
@@ -85 +85 @@
         def __parse(self):
                 for capXmlText in self.__dom.getElementsByTagName(self.__tag_item):
-                        self.handleAtom(CapAtom(capXmlText, self.__state))
+                        self.handleAtom(WeatherAlert(capXmlText, self.__state))
 
         def getSimFetch(self):