From a24a7f27a63b8453c9b2075402de671d2958a143 Mon Sep 17 00:00:00 2001 From: "Shawn.Hooper" Date: Fri, 25 Apr 2014 10:19:48 -0400 Subject: [PATCH] ASM #224 - WarnGen: OB13.5.2 Template Errors Change-Id: I99339c0ea3d0110ca855dd3db82b41b28a32dd6d Former-commit-id: 1c57e8aff31685b91bded3a3095e4ab7d5144866 [formerly 8ffe88d8566859c3cf4eeaa4e4318f276b854676] [formerly 09204a381c38a55b4a402d4aadd8e441b5d5a480] [formerly 1c57e8aff31685b91bded3a3095e4ab7d5144866 [formerly 8ffe88d8566859c3cf4eeaa4e4318f276b854676] [formerly 09204a381c38a55b4a402d4aadd8e441b5d5a480] [formerly 79db962a88c2ffdceca6a4c6ee4c13bb96fb6b1a [formerly 09204a381c38a55b4a402d4aadd8e441b5d5a480 [formerly c6fffaf265dc184b7692a43bb461572f54b8190a]]]] Former-commit-id: 79db962a88c2ffdceca6a4c6ee4c13bb96fb6b1a Former-commit-id: 582b4278877cb86695c86d382dda6f532dbcc80c [formerly 896fe0691eac80b9ea84c025b16ac4f7981ae8d3] [formerly 26e91355d924022c1555e2525aa609d82fe0c107 [formerly c49eee4928153ca9110d627112a3d0447387e97c]] Former-commit-id: 692bf78cd5c67201c51aa8c49e34553b60097895 [formerly ceb1c711ea5d910ec214f372f16bfb9d7a026b9d] Former-commit-id: bfee40353b042f5c2b5702369f0d06bd3c798093 --- .../common_static/base/warngen/arealFloodWarningFollowup.vm | 4 +--- .../base/warngen/impactSevereWeatherStatement.vm | 3 +-- .../common_static/base/warngen/severeWeatherStatement.vm | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) mode change 100755 => 100644 edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup.vm mode change 100755 => 100644 edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.vm mode change 100755 => 100644 edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/severeWeatherStatement.vm diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup.vm b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup.vm old mode 100755 new mode 100644 index caf8433c89..a67c37eacc --- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup.vm +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup.vm @@ -11,6 +11,7 @@ ## Evan Bookbinder 9-18-2013 implemented config.vm ## Mike Rega 1-18-2014 added Alaska GP changes for 14.2.1 ## Mike Rega 2-27-2014 changed headline items to match 10-922 +## Mike Rega 4-23-2014 fixed MND blank line #################################### SET SOME VARs ################################### #parse("config.vm") #set($hycType = "") @@ -75,7 +76,6 @@ ${area.name}## #end -## #end - #elseif(${CORCAN}=="true") ${ugclinecan} ################### VTEC/COUNTY LINE ################## @@ -88,7 +88,6 @@ ${area.name}## #end -## #end - #else ${ugcline} ################### VTEC/COUNTY LINE ################## @@ -101,7 +100,6 @@ ${area.name}## #end -## #end - #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.vm b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.vm old mode 100755 new mode 100644 index 0d6a506fad..0beb51d369 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.vm +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.vm @@ -7,6 +7,7 @@ ## UPDATED -- Kurimski 9/17/13 Tor Emer Headline ## ## UPDATED -- Bookbinder 9/18/13 Implement config.vm ## ## Mike Dangelo 1/24/2014 added logic to keep defaultCTAs from being used in a TOR EMER (duplication) +## Mike Rega 4/23/14 fixed MND blank line in CAN segment ## ################################################################ ## Commented out Impact statements Feb 2013 and created file to ## be parsed into the template called impactStatements.vm @@ -104,7 +105,6 @@ ${area.name}## #end -## #end - #elseif(${CORCAN}=="true") ${ugclinecan} /${productClass}.COR.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire},${timeFormat.ymdthmz})}/ @@ -115,7 +115,6 @@ ${area.name}## #end -## #end - #else ${ugcline} /${productClass}.${action}.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire},${timeFormat.ymdthmz})}/ diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/severeWeatherStatement.vm b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/severeWeatherStatement.vm old mode 100755 new mode 100644 index ce629abeb0..31cbd3f5b7 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/severeWeatherStatement.vm +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/severeWeatherStatement.vm @@ -10,6 +10,7 @@ ## EVAN BOOKBINDER 9-18-2013 Implemented config.vm ## ## MIKE DANGELO 1-22-2104 Tweaked default CTA wording to fix parseString problems and torEmerCTA to use new verbage ## ## Removed preAmbleTOR (not used) -mmd 1/23/2014, preAmble for other tor-sighted/confirmed bullets retained +## Mike Rega 4/24/2014 fixed MND blank line in CAN ## ################################################################# ## ################################################################### @@ -76,7 +77,6 @@ ${area.name}## #end -## #end - #elseif(${CORCAN}=="true") ${ugclinecan} /${productClass}.COR.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire},${timeFormat.ymdthmz})}/ @@ -87,7 +87,6 @@ ${area.name}## #end -## #end - #else ${ugcline} /${productClass}.${action}.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire},${timeFormat.ymdthmz})}/