Changeset 154:af3c0e9a711e

Timestamp:

11/15/08 16:39:39 (3 years ago)

Author:

chris

Branch:

unix

Message:

break fetching out to separate class

Location:

StormSiren

Files:

• XmlFetcher.py (added)
• XmlWeather.py (modified) (4 diffs)

StormSiren/XmlWeather.py

@@ -42 +42 @@
 """
 
-import urllib2
 import logging
-import sys
-from xml.dom import minidom
 
 from WeatherTypes import *
+from XmlFetcher import *
 from CAP import CAP
 
@@ -56 +54 @@
                 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.__baseurl    = 'http://www.weather.gov/wwarss-tst/'
+                #self.__url        = self.__baseurl + self.__state.lower() + ".php?x=0" 
+                self.__url        = "http://www.weather.gov/alerts/" + self.__state.lower() + ".cap" 
+                #self.__tag_item   = 'cap:info'
+                self.__tag_item   = 'entry'
                 self.__history    = history
                 self.__simfetch   = simfetch
                 self.__proxy      = proxy
+                self.__atoms      = XmlFetcher(self.__url, self.__simfetch, self.__proxy)
                 self.log = logging.getLogger("XmlWeather")
 
@@ -73 +73 @@
 
         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:
-                                if(self.__proxy):
-                                        self.log.info("Using proxy: %s" % self.__proxy)
-                                        proxy_support = urllib2.ProxyHandler({"http" : self.__proxy})
-                                        opener = urllib2.build_opener(proxy_support, urllib2.HTTPHandler)
-                                        urllib2.install_opener(opener)
-                                self.__dom = minidom.parse(urllib2.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):
@@ -94 +79 @@
                                 "State: " + self.__state + "\n" + \
                                 "URL: " + self.__url + "\n"
-
-                if(self.__simfetch):
-                        str += "Sim Fetch: yes\n"
-                else:
-                        str += "Sim Fetch: no\n"
                 return str