Changeset 190:75d280708ff5 for StormSiren/XmlWeather.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/XmlWeather.py (modified) (3 diffs)

StormSiren/XmlWeather.py

@@ -42 +42 @@
 """
 
-import urllib
 import logging
-import sys
-from xml.dom import minidom
 
 from WeatherTypes import *
-from CAP import CAP
+from XmlFetcher import *
+from WeatherAlert import WeatherAlert
 
 class XmlWeather(object):
-        def __init__(self, state, history, simfetch = False):
+        def __init__(self, state, simfetch = False, proxy = None):
                 super(XmlWeather,self).__init__()
                 self.__data       = ''
                 self.__state      = state
                 self.__dom        = []
-                self.__baseurl    = 'http://www.weather.gov/alerts/'
-                self.__namespace  = 'http://purl.org/dc/elements/1.1/'
-                self.__url        = self.__baseurl + self.__state.lower() + ".cap" 
-                self.__tag_item   = 'cap:info'
-                self.__history    = history
+                self.__baseurl    = 'http://www.weather.gov/wwarss-tst/'
+                self.__url        = self.__baseurl + self.__state.lower() + ".php?x=0" 
+                self.__tag_item   = 'entry'
                 self.__simfetch   = simfetch
-                self.log = logging.getLogger("XmlWeather")
+                self.__proxy      = proxy
+                self.__atoms      = XmlFetcher(self.__url, self.__simfetch, self.__proxy)
+                self.log          = logging.getLogger("XmlWeather")
 
                 self.log.setLevel(logging.DEBUG)
@@ -74 +72 @@
 
         def __fetch(self):
-                self.log.info("Fetching: " + self.__url)
-                try:
-                        if(self.__simfetch):
-                                self.log.info("Simulating fetch using examples directory")
-                                self.__dom = minidom.parse("examples/" + self.__state.lower() + ".cap")
-                        else:
-                                self.__dom = minidom.parse(urllib.urlopen(self.__url))
-                except IOError,e:
-                        # No net connection available, exit.
-                        self.log.error("Internet connection not available?, exiting: %s" % e)
-                        sys.exit()
+                self.__dom = self.__atoms.fetch()
 
         def __str__(self):
                 str  = "XmlWeather:\n" + \
+                                "SimFetch: " + self.__simfetch + "\n" + \
+                                "Proxy: " + self.__proxy + "\n" + \
                                 "State: " + self.__state + "\n" + \
                                 "URL: " + self.__url + "\n"
-
-                if(self.__simfetch):
-                        str += "Sim Fetch: yes\n"
-                else:
-                        str += "Sim Fetch: no\n"
                 return str
 
@@ -102 +87 @@
         def __parse(self):
                 for capXmlText in self.__dom.getElementsByTagName(self.__tag_item):
-                        cap_item = CAP(capXmlText, self.__state)
-                        #cap_item.display()
-                        if(not self.__history.exists(cap_item.id)):
-                                alerted = self.handleAlert(cap_item)
-                                if(alerted):
-                                        self.__history.add(cap_item.id)
-                        else:
-                                self.log.debug("Ignoring %s: Already alerted on" % cap_item.id)
+                        self.handleAtom(WeatherAlert(capXmlText, self.__state))
 
+        def getSimFetch(self):
+                return self.__simfetch
 
-        def handleAlert(self,cap_item):
-                self.log.debug("handleAlert(%s) - %s/%s" % (cap_item.id, cap_item.county, cap_item.state))
-                return True
+        simfetch = property(getSimFetch,None,None)
+
+        def getProxy(self):
+                return self.__proxy
+
+        proxy = property(getProxy,None,None)