Changeset 164:eb6d586c26ca

Timestamp:

11/17/08 06:57:08 (3 years ago)

Author:

chris

Branch:

unix

Parents:

163:add6c666eee7 (diff), 151:a7ee6e988273 (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:

remove stale CAP class references

Files:

• StormSiren/CAP.py (deleted)
• StormSiren/StormWeather.py (modified) (2 diffs)
• StormSiren/StormWeather.py (modified) (1 diff)
• StormSiren/TestAlert.py (modified) (1 diff)
• StormSiren/TestAlert.py (modified) (1 diff)
• StormSiren/WeatherAlert.py (modified) (4 diffs)
• examples/cap1.1/tx.0 (deleted)
• examples/cap1.1/tx.1 (deleted)
• examples/cap1.1/tx.2 (deleted)
• examples/cap1.1/wy.0 (deleted)
• examples/cap1.1/wy.1 (deleted)
• examples/cap1.1/wy.2 (deleted)

StormSiren/StormWeather.py

@@ -48 +48 @@
 from WeatherAlert import *
 from XmlWeather import *
-from CAP import CAP
 
 class StormWeather(XmlWeather):
@@ -83 +82 @@
                         if(dev.isAlertWanted(cap_item)):
                                 if(not self.__simalert):
+                                        cap_item.expand(self.simfetch,self.proxy)
                                         dev.send(WeatherAlert(cap_item))
                                         alerted = True

StormSiren/StormWeather.py

@@ -48 +48 @@
 from WeatherAlert import *
 from XmlWeather import *
-from CAP import CAP
 
 class StormWeather(XmlWeather):

StormSiren/TestAlert.py

@@ -49 +49 @@
 from WeatherTypes import *
 from WeatherAlert import *
-from CAP import CAP
 
 class TestAlert(object):

StormSiren/TestAlert.py

@@ -49 +49 @@
 from WeatherTypes import *
 from WeatherAlert import *
-from CAP import CAP
 
 class TestAlert(object):

StormSiren/WeatherAlert.py

@@ -51 +51 @@
         def __init__(self,cap_item):
                 self.cap_item = cap_item
-                self.__area = cap_item.county + " / " + cap_item.state
-                self.__terse  = cap_item.event + "\n" + \
-                                                self.area + "\n" + \
+                self.__terse  = cap_item.headline + "\n" + \
                                                 "Expires: " + cap_item.expires + "\n"
-                self.__text = cap_item.event + " for " + self.area + "\n\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.desc + "\n"
-
-                #self.parseDesc()
+                self.__detailed = self.text + "\n\n" + cap_item.description + "\n"
 
         def __str__(self):
@@ -75 +71 @@
 
         def getDetailedWithFormat(self, desc_width):
-                return self.text + "\n\n" + textwrap.fill(self.cap_item.desc.replace("\n",' '),desc_width) + "\n"
+                return self.text + "\n\n" + textwrap.fill(self.cap_item.description.replace("\n",' '),desc_width) + "\n"
 
         def getDetailed(self):
-                return self.text + "\n\n" + self.cap_item.desc + "\n"
+                return self.text + "\n\n" + self.cap_item.description + "\n"
 
         def getEvent(self):
@@ -86 +82 @@
                 return self.cap_item.id
 
-        def getArea(self):
-                return self.__area
-
         def getType(self):
                 return self.cap_item.type
@@ -95 +88 @@
                 return self.cap_item.state
 
-        def getCounty(self):
-                return self.cap_item.county
-
         id = property(getId,None,None)
         event = property(getEvent,None,None)
         type = property(getType,None,None)
         state = property(getState,None,None)
-        county = property(getCounty,None,None)
 
-        area = property(getArea,None,None)
         text = property(getText,None,None)
         terse = property(getTerse,None,None)
         detailed = property(getDetailed,None,None)
-
-        def parseDesc(self):
-                time_re = re.compile("\/.*\/")
-                desc = self.cap_item.desc.split("\n")
-                for l in desc:
-                        print "blah: %s" % l
-
-                res = time_re.search(self.cap_item.desc)
-                print "blahres: %s" % res.group(0)
-
-                print "area_re: %s" %(res.group(0) + ".*" + desc[3])
-                area_re = re.compile(res.group(0) + "(.*)" + desc[3], re.DOTALL | re.M)
-                print "area_re: %s" % area_re
-                res2 = area_re.search(self.cap_item.desc)
-                print "foores: %s" % res2.group(1)
-
-                city_re = re.compile("(.*)" + "INCLUDING THE CITIES OF\.\.\.?" + "(.*)", re.DOTALL | re.M)
-                res3 = city_re.search(res2.group(1))
-                print "city_re1: %s" % res3.group(1).replace("-",",").replace("\n","").title()
-                print "city_re2: %s" % res3.group(2).replace("...",",").replace("\n","").title()
-
-                print("type/priority: %s" % desc[1])
-                print("originator: %s" % desc[2].title())
-                print("effective date: %s" % desc[3])
-                print("overall desc: %s" % desc[4])
-                effdate = desc[3]
-#/O.CON.KALY.WI.Y.0011.081028T1600Z-081029T1200Z/
-
-
-
-                sys.exit(0)