ASM #13467 - Update GenericHazards.py for Shannon

Change-Id: Ic1131929aa14f97cff0e1cf92e30c338470f368e

Former-commit-id: 700bc0691c [formerly 4d81023184] [formerly ddeec493c3 [formerly f4e8f7493bbfb025e8040f7663dc582414a87413]]
Former-commit-id: ddeec493c3
Former-commit-id: f1feaee0ea
This commit is contained in:
Shawn.Hooper 2014-10-21 11:09:50 -04:00
parent 31e1eaf1cf
commit 115a9c1fd9

View file

@ -505,7 +505,8 @@ class TextProduct(TextRules.TextRules, SampleAnalysis.SampleAnalysis,
hazNameA = self.hazardName(eachHazard['hdln'], argDict, True)
hazName = self.hazardName(eachHazard['hdln'], argDict, False)
if hazName == "WINTER WEATHER ADVISORY" or hazName == "WINTER STORM WARNING":
# if hazName == "WINTER WEATHER ADVISORY" or hazName == "WINTER STORM WARNING":
if hazName in ["WINTER WEATHER ADVISORY", "WINTER STORM WARNING", "BEACH HAZARDS STATEMENT"]:
forPhrase = " FOR |* ENTER HAZARD TYPE *|"
else:
forPhrase =""
@ -735,8 +736,12 @@ class TextProduct(TextRules.TextRules, SampleAnalysis.SampleAnalysis,
segmentTextSplit[1] = PRECAUTION + segmentTextSplit2[1]
segmentText = string.join(segmentTextSplit,"")
if removeBulletList != []:
if keepBulletList == []:
segmentText = "\n\n|* WRAP-UP TEXT GOES HERE *|.\n"
elif removeBulletList != []:
segmentText = "|*\n" + segmentText + "*|"
else:
segmentText = segmentText
#
# If segment passes the above checks, add the text