Changeset 172:16c722e50db9

Timestamp:

11/26/08 01:47:17 (3 years ago)

Author:

cfreeze@…

Branch:

CAP_1.1

Message:

cleaning pass since moving to the new CAP 1.1 format for all the fields that are being parsed

Location:

StormSiren

Files:

• CapAlert.py (modified) (2 diffs)
• CapAtom.py (modified) (4 diffs)
• StormWeather.py (modified) (2 diffs)
• WeatherAlert.py (modified) (2 diffs)

StormSiren/CapAlert.py

@@ -78 +78 @@
                         return ""
 
+        def __trim(self,str):
+                if(str):
+                        str = str.strip()
+                        str = str.replace("\n","")
+                        return str
+
         def __parse(self):
-                self.__headline = self.__getfield(self.__dom,self.__tag_headline)
-                self.__description = self.__getfield(self.__dom,self.__tag_description)
+                self.__headline = self.__trim(self.__getfield(self.__dom,self.__tag_headline))
+                self.__description = self.__trim(self.__getfield(self.__dom,self.__tag_description))
 
         def __str__(self):
@@ -97 +103 @@
                 return self.__description
 
-        description = property(getDescription,None,None)
-
         def getHeadline(self):
                 return self.__headline
 
+        description = property(getDescription,None,None)
         headline = property(getHeadline,None,None)

StormSiren/CapAtom.py

@@ -149 +149 @@
                         return ""
 
-        def __str__(self):
-                str = "\tId: " + self.id + "\n" + \
-                                "\tState: " + self.state + "\n"
-                str += "\tArea: %s\n" % self.__areas
-                if(self.__type != None):
-                                str += "\tType: " + WeatherTypes.toString(self.__type) + "\n"
-                if(self.__matter != None):
-                                str += "\tMatter: " + self.__matter + "\n"
-                if(self.__url != None):
-                                str += "\tURL: " + self.__url + "\n"
-                if(self.__issued != None):
-                                str += "\tIssued: " + self.issued + "\n"
-                if(self.__expires != None):
-                                str += "\tExpires: " + self.expires + "\n"
-                if(self.__urgency != None):
-                                str += "\tUrgency: " + self.__urgency + "\n"
-                if(self.__severity != None):
-                                str += "\tSeverity: " + self.__severity + "\n"
-                if(self.__certainty != None):
-                                str += "\tCertainty: " + self.__certainty + "\n"
-                return str
-
         def display(self):
                 print self.__str__()
@@ -176 +154 @@
         def displayFull(self):
                 self.display()
-                print "\tDesc: " + self.desc
+                print "\tDesc: " + self.description
 
         def getState(self):
                 return self.__state
 
-        state = property(getState,None,None)
-
-        def getDesc(self):
-                return self.__desc
-
-        desc = property(getDesc,None,None)
-
         def getIssued(self):
-                return self.__issued.strftime("%a %b %d %Y - %I:%M:%S %p")
-
-        issued = property(getIssued,None,None)
+                if(self.__issued):
+                        return self.__issued.strftime("%a %b %d %Y - %I:%M:%S %p")
+                else:
+                        return None
 
         def getExpires(self):
-                return self.__expires.strftime("%a %b %d %Y - %I:%M:%S %p")
-
-        expires = property(getExpires,None,None)
+                if(self.__expires):
+                        return self.__expires.strftime("%a %b %d %Y - %I:%M:%S %p")
+                else:
+                        return None
+
+        def getUpdated(self):
+                if(self.__updated):
+                        return self.__updated.strftime("%a %b %d %Y - %I:%M:%S %p")
+                else:
+                        return None
 
         def getType(self):
                 return self.__type
 
-        type = property(getType,None,None)
-
         def getId(self):
                 return self.__id
 
-        id = property(getId,None,None)
-
         def getAreas(self):
                 return self.__areas
 
-        areas = property(getAreas,None,None)
+        def getMatter(self):
+                return self.__matter
 
         def expanded(self):
@@ -222 +198 @@
                         self.__cap_alert = CapAlert(self.__url,simfetch,proxy)
 
+        def getDescription(self):
+                if(self.__cap_alert):
+                        return self.__cap_alert.description
+                else:
+                        return None
+
         def getHeadline(self):
                 if(self.__cap_alert):
@@ -228 +210 @@
                         return None
 
+        def getUrl(self):
+                return self.__url
+
+        def getUrgency(self):
+                return self.__urgency
+
+        def getSeverity(self):
+                return self.__severity
+
+        def getCertainty(self):
+                return self.__certainty
+
+        id = property(getId,None,None)
+        areas = property(getAreas,None,None)
+        type = property(getType,None,None)
+        state = property(getState,None,None)
+        matter = property(getMatter,None,None)
         headline = property(getHeadline,None,None)
-
-        def getDescription(self):
-                if(self.__cap_alert):
-                        return self.__cap_alert.description
-                else:
-                        return None
+        url = property(getUrl,None,None)
+        issued = property(getIssued,None,None)
+        expires = property(getExpires,None,None)
+        updated = property(getUpdated,None,None)
+        urgency = property(getUrgency,None,None)
+        severity = property(getSeverity,None,None)
+        certainty = property(getCertainty,None,None)
+        headline = property(getHeadline,None,None)
         description = property(getDescription,None,None)
+
+        def __str__(self):
+                str = "\tId: " + self.id + "\n" + \
+                        "\tState: " + self.state + "\n"
+                str += "\tArea: %s\n" % self.__areas
+                if(self.type != None):
+                        str += "\tType: " + WeatherTypes.toString(self.__type) + "\n"
+                if(self.headline != None):
+                        str += "\tHeadline: " + self.headline + "\n"
+                if(self.matter != None):
+                        str += "\tMatter: " + self.matter + "\n"
+                if(self.url != None):
+                        str += "\tURL: " + self.__url + "\n"
+                if(self.issued != None):
+                        str += "\tIssued: " + self.issued + "\n"
+                if(self.expires != None):
+                        str += "\tExpires: " + self.expires + "\n"
+                if(self.updated != None):
+                        str += "\tUpdated: " + self.updated + "\n"
+                if(self.urgency != None):
+                        str += "\tUrgency: " + self.__urgency + "\n"
+                if(self.severity != None):
+                        str += "\tSeverity: " + self.__severity + "\n"
+                if(self.certainty != None):
+                        str += "\tCertainty: " + self.__certainty + "\n"
+                return str

StormSiren/StormWeather.py

@@ -71 +71 @@
                 self.__alert_devs.append(dev)
 
+        def logAtom(self, 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=======")
+
         def handleAtom(self, cap_atom):
-                cap_atom.display()
+                self.logAtom(cap_atom)
                 if(not self.__history.exists(cap_atom.id)):
                         for dev in self.__alert_devs:
@@ -78 +87 @@
                                         if(not self.__simalert):
                                                 cap_atom.expand(self.simfetch,self.proxy)
+                                                self.logAtom(cap_atom)
                                                 dev.send(WeatherAlert(cap_atom))
                                                 self.__history.add(cap_atom.id)

StormSiren/WeatherAlert.py

@@ -77 +77 @@
 
         def getEvent(self):
-                return self.cap_item.event
+                return self.cap_item.matter
 
         def getId(self):
@@ -92 +92 @@
         type = property(getType,None,None)
         state = property(getState,None,None)
-
         text = property(getText,None,None)
         terse = property(getTerse,None,None)