From e426037c09d429308a003b311ebd84d96ccd0100 Mon Sep 17 00:00:00 2001 From: David Gillingham Date: Wed, 22 May 2013 11:42:08 -0500 Subject: [PATCH] Issue #1759: Fix regression to ISC request reply due to missing import. Change-Id: I7b02c482d3a8f231a32a2a176773aa7a3be74c80 Former-commit-id: b992dda69365d9b8e90eb1a9ac86a4b28a170d10 [formerly 511098fffdccdccd0fed3f1f8c9301926ff0469e] [formerly 2555cf9819fc6b354e982fe6f48191f7591358e3] [formerly fc3c7eb9fbf37bb7d9daf99d556d79bdf45aeb63 [formerly 2555cf9819fc6b354e982fe6f48191f7591358e3 [formerly 5cba0f5e408cc175a37bcff955b4caf9aaeef1ff]]] [formerly 801c65910813031c6d2a9710e7b124c478a56a2c [formerly 2555cf9819fc6b354e982fe6f48191f7591358e3 [formerly 5cba0f5e408cc175a37bcff955b4caf9aaeef1ff] [formerly 801c65910813031c6d2a9710e7b124c478a56a2c [formerly fecafacad11ac0099d161bb8b7ba2b9b6c56e4ca]]]] Former-commit-id: 801c65910813031c6d2a9710e7b124c478a56a2c Former-commit-id: 18c8ef624337cc48dafc64b8d4831c73ee8807ba [formerly 7464c78970ff1efe18387d6d2105db0eb2e2d4ad] [formerly 1471a7fa3426fb59b3cc733ed2a2b8073df2ab1c [formerly 60aeb71652ed68ce1199486fa6faca470de10f6a]] Former-commit-id: 1471a7fa3426fb59b3cc733ed2a2b8073df2ab1c Former-commit-id: 60850d6f8a24e17079fcc4811cd5f1e8ab7686a4 --- .../src/com/raytheon/edex/plugin/gfe/isc/IscScript.java | 3 +++ .../utility/edex_static/base/gfe/isc/IrtServer.py | 3 +++ .../utility/edex_static/base/gfe/isc/ifpnetCDF.py | 3 +-- .../utility/edex_static/base/gfe/isc/iscMosaic.py | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscScript.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscScript.java index fa710dbd69..d16e4827b1 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscScript.java +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscScript.java @@ -46,6 +46,8 @@ import com.raytheon.uf.common.util.FileUtil; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Mar 11, 2013 dgilling Initial creation + * May 22, 2013 #1759 dgilling Ensure addSitePath() also adds base + * path. * * * @@ -127,6 +129,7 @@ public class IscScript extends PythonScript { .getValue("sys.path.index('" + basePath + "')"); } else { index = (Integer) jep.getValue("len(sys.path)"); + jep.eval("sys.path.insert(" + index + ", '" + basePath + "')"); } jep.eval("sys.path.insert(" + index + ", '" + sitePath + "')"); } diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/IrtServer.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/IrtServer.py index 437cf96733..72512699e9 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/IrtServer.py +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/IrtServer.py @@ -42,6 +42,8 @@ from com.raytheon.edex.plugin.gfe.isc import IRTManager # 03/13/13 1759 dgilling Move siteConfig imports into # functions where module is used # to interact better with IscScript. +# 05/22/13 1759 dgilling Add missing import to +# makeISCrequest(). # # # @@ -244,6 +246,7 @@ def irtGetServers(ancfURL, bncfURL, iscWfosWanted): # xmlRequest is the original request from the GFE's ISCRequestDialog. def makeISCrequest(xmlRequest, gridDims, gridProj, gridBoundBox, mhs, host, port, protocol, site, xmtScript): import IrtAccess + import siteConfig import xml from xml.etree import ElementTree from xml.etree.ElementTree import Element, SubElement diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py index bad2e53d98..448fc1e692 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py @@ -64,7 +64,7 @@ from com.raytheon.uf.common.localization import LocalizationContext_Localization # 03/11/13 1759 dgilling Removed unneeded methods. # 04/23/13 1937 dgilling Reimplement WECache to match # A1, big perf improvement. -# +# 05/23/13 1759 dgilling Remove unnecessary imports. # # @@ -77,7 +77,6 @@ ifpNetcdfLogger=None ## Logging methods ## def initLogger(logFile=None): global ifpNetcdfLogger - import logging, siteConfig ifpNetcdfLogger = iscUtil.getLogger("ifpnetCDF",logFile) def logEvent(*msg): diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py index d60d1c825e..5ac2bcf270 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py @@ -79,6 +79,7 @@ from com.raytheon.uf.edex.database.cluster import ClusterTask # 04/24/13 1941 dgilling Re-port WECache to match A1. # 05/08/13 1988 dgilling Fix history handling bug in # __getDbGrid(). +# 05/23/13 1759 dgilling Remove unnecessary imports. # # @@ -248,7 +249,6 @@ class IscMosaic: ## Logging methods ## def __initLogger(self): - import logging, siteConfig self.__logger=iscUtil.getLogger("iscMosaic",self.__logFile) def __init__(self, args):