From 2ee78eaf6d3f449c325d7c577444d6fd4bf09c43 Mon Sep 17 00:00:00 2001 From: Steve Harris Date: Tue, 25 Sep 2012 10:21:10 -0500 Subject: [PATCH] 12.10.1-7 baseline Former-commit-id: 7b37cfca85e69b9fca897cb4697576d06df1f26d [formerly 161fb1c0295ff4aa3b78d06ae248255d77a4e886] Former-commit-id: b7546301362b69af1efd5e945ca47333b36c3e5b --- .../cave/etc/gfe/userPython/procedures/MakeHazard.py | 10 ++++++++-- .../edex/util/satellite/SatelliteMenuUtil.java | 5 ++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/MakeHazard.py b/cave/build/static/common/cave/etc/gfe/userPython/procedures/MakeHazard.py index 8b263bd0ab..9b41e7087d 100644 --- a/cave/build/static/common/cave/etc/gfe/userPython/procedures/MakeHazard.py +++ b/cave/build/static/common/cave/etc/gfe/userPython/procedures/MakeHazard.py @@ -224,8 +224,14 @@ class Procedure (SmartScript.SmartScript): hazardKey = selectedHazard defaultHazKey = "" - if len(defaultSegment) > 0 and defaultHazard is not None: - defaultHazKey = defaultHazard + ":" + defaultSegment + if defaultHazard is not None: + index = string.find(defaultHazard, " ") + if index != -1: + defaultHazard = defaultHazard[0:index] + defaultHazKey = defaultHazard + + if len(defaultSegment) > 0: + defaultHazKey += ":" + defaultSegment weName = self._hazUtils._makeTempWEName(hazardKey) diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatelliteMenuUtil.java b/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatelliteMenuUtil.java index cfa3ff0cea..d7ff45c47a 100644 --- a/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatelliteMenuUtil.java +++ b/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatelliteMenuUtil.java @@ -166,6 +166,8 @@ public class SatelliteMenuUtil extends AbstractMenuUtil { sub.key = "entity"; sub.value = "GOES%"; ((CommonIncludeMenuContribution) file.contributions[0]).substitutions[4] = sub; + toXml(fileOCONUS, "menus" + File.separator + "satellite" + File.separator + + "baseDerivedProductsImagery.xml"); } else { // decide on east conus or west conus ((CommonIncludeMenuContribution) file.contributions[0]).fileName = new File( @@ -234,9 +236,6 @@ public class SatelliteMenuUtil extends AbstractMenuUtil { toXml(file, "menus" + File.separator + "satellite" + File.separator + "baseComposite.xml"); - toXml(fileOCONUS, "menus" + File.separator + "satellite" + File.separator - + "baseDerivedProductsImagery.xml"); - statusHandler.info("Finished creating satellite menus"); }