Changeset 170:25f97cee8ceb
- Timestamp:
- 11/19/08 06:46:52 (3 years ago)
- Author:
- chris
- Branch:
- CAP_1.1
- Message:
-
clean spaces out of areas from the CAP atom so that the area matching works again
- Location:
- StormSiren
- Files:
-
Legend:
- Unmodified
- Added
- Removed
-
|
r160
|
r170
|
|
| 138 | 138 | if(self.__areas.has_key(state)): |
| 139 | 139 | for area in alert_areas: |
| | 140 | self.log.debug("checking if %s is in (%s)" % (area.lower(),self.__areas[state])) |
| 140 | 141 | if(area.lower() in self.__areas[state]): |
| | 142 | self.log.debug("%s IS IN (%s)" % (area.lower(),self.__areas[state])) |
| 141 | 143 | return True |
| 142 | 144 | return False |
| … |
… |
|
| 149 | 151 | self.log.debug("Alert hit on area[%s/%s]: %s" % (cap_alert.state, cap_alert.id, cap_alert.areas)) |
| 150 | 152 | return True |
| | 153 | else: |
| | 154 | self.log.debug("Testing[%s]: alert not in watched area(%s/%s)" % (cap_alert.id, cap_alert.state, cap_alert.areas)) |
| | 155 | else: |
| | 156 | self.log.debug("Testing[%s]: Either wrong type or state (%s/%i)" % (cap_alert.id, cap_alert.state, cap_alert.type)) |
| 151 | 157 | return False |
| 152 | 158 | #CODE END |
-
|
r166
|
r170
|
|
| 53 | 53 | class CapAtom: |
| 54 | 54 | def __init__(self,xml,state): |
| 55 | | self.log = logging.getLogger("XmlWeather") |
| | 55 | self.log = logging.getLogger("CapAtom") |
| 56 | 56 | |
| 57 | 57 | self.__tag_url = 'id' |
| … |
… |
|
| 91 | 91 | self.__parse(xml) |
| 92 | 92 | |
| | 93 | def __trim(self,str): |
| | 94 | if(str): |
| | 95 | str = str.strip() |
| | 96 | str = str.replace("\n","") |
| | 97 | |
| 93 | 98 | def __parse(self,xml): |
| 94 | 99 | self.__url = self.__getfield(xml,self.__tag_url) |
| … |
… |
|
| 104 | 109 | self.__updated = self.getDateTime(self.__getfield(xml,self.__tag_updated)) |
| 105 | 110 | |
| 106 | | urgency = self.__getfield(xml,self.__tag_urgency) |
| 107 | | if(urgency): |
| 108 | | self.__urgency = urgency.replace("\n", "") |
| 109 | | |
| 110 | | severity = self.__getfield(xml,self.__tag_severity) |
| 111 | | if(severity): |
| 112 | | self.__severity = severity.replace("\n", "") |
| 113 | | |
| 114 | | certainty = self.__getfield(xml,self.__tag_certainty) |
| 115 | | if(certainty): |
| 116 | | self.__certainty = certainty.replace("\n", "") |
| | 111 | self.__urgency = self.__trim(self.__getfield(xml,self.__tag_urgency)) |
| | 112 | self.__severity = self.__trim(self.__getfield(xml,self.__tag_severity)) |
| | 113 | self.__certainty = self.__trim(self.__getfield(xml,self.__tag_certainty)) |
| 117 | 114 | |
| 118 | 115 | areas = self.__getfield(xml,self.__tag_area) |
| 119 | 116 | if(areas): |
| | 117 | areas = areas.strip() |
| 120 | 118 | areas = areas.replace("\n",' ') |
| 121 | 119 | areas = areas.replace("/", ';') |
