Changeset 177:e7e54a896aa3

Timestamp:

11/26/08 03:40:55 (3 years ago)

Author:

cfreeze@…

Branch:

CAP_1.1

Message:

clean up the execution device to actually be usable on the commandline

Location:

StormSiren

Files:

• EmailAlertDevice.py (modified) (1 diff)
• ExecutionAlertDevice.py (modified) (1 diff)
• WeatherAlert.py (modified) (2 diffs)
• WeatherTypes.py (modified) (2 diffs)

StormSiren/EmailAlertDevice.py

@@ -78 +78 @@
 
         def send(self,alert):
-                subject = EMAIL_SUBJECT_LEADER + " - " + alert.headline + alert.getAreas()
+                subject = EMAIL_SUBJECT_LEADER + " - " + alert.headline + " (" + alert.getAreas() + ")"
                 alert_body = ""
 

StormSiren/ExecutionAlertDevice.py

@@ -77 +77 @@
         def _execute(self,exe,alert):
                 try:
-                        subprocess.Popen([exe,alert.id,WeatherTypes.toString(alert.type),alert.state,alert.county]).wait()
-                        self.log.info("Executing: [%s %s %s %s %s]" % (exe,alert.id,WeatherTypes.toString(alert.type),alert.state,alert.county))
+                        subprocess.Popen([exe,alert.id,"\"" + WeatherTypes.toString(alert.type) + "\"",alert.state,"\"" + alert.getAreas() + "\""]).wait()
+                        self.log.info("Executing: [%s %s %s %s %s]" % (exe,alert.id,"\"" + WeatherTypes.toString(alert.type) + "\"",alert.state,"\"" + alert.getAreas() + "\""))
                 except os.error:
-                        self.log.error("Problem Executing: [%s %s %s %s %s]" % (exe,alert.id,WeatherTypes.toString(alert.type),alert.state,alert.county))
+                        self.log.error("Problem Executing: [%s %s %s %s %s]" % (exe,alert.id,"\"" + WeatherTypes.toString(alert.type),alert.state,"\"" + alert.getAreas() + "\""))
 
 class ExecutionAlertDeviceInfo(object):

StormSiren/WeatherAlert.py

@@ -63 +63 @@
 
         def getText(self):
-                str = self.headline + "\n\n"
+                str = self.headline + " (" + self.getAreas() + ")\n\n"
                 str     += " Issued: " + self.issued + "\n"
                 str += "Expires: " + self.expires + "\n"
@@ -80 +80 @@
 
         def getAreas(self):
-                str = "("
-                str += string.join(self.areas,',')
-                str += ")"
+                str = string.join(self.areas,',')
                 return str
 

StormSiren/WeatherTypes.py

@@ -42 +42 @@
 """
 
+import string
+
 UNKNOWN   = 0
 WARNING   = 1
@@ -76 +78 @@
                         wtypes.append("Alert")
 
-                return "(" + "|".join(wtypes) + ")"
+                return string.join(wtypes,"|")
         toString = staticmethod(toString)