xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #1759: Fix regression to ISC request reply due to missing import.

Browse source 
Change-Id: I7b02c482d3a8f231a32a2a176773aa7a3be74c80

Former-commit-id: b992dda693 [formerly 511098fffd] [formerly 2555cf9819] [formerly fc3c7eb9fbf37bb7d9daf99d556d79bdf45aeb63 [formerly 2555cf9819 [formerly 5cba0f5e40]]] [formerly 801c659108 [formerly 2555cf9819 [formerly 5cba0f5e40] [formerly 801c659108 [formerly fecafacad11ac0099d161bb8b7ba2b9b6c56e4ca]]]]
Former-commit-id: 801c659108
Former-commit-id: 18c8ef624337cc48dafc64b8d4831c73ee8807ba [formerly 7464c78970ff1efe18387d6d2105db0eb2e2d4ad] [formerly 1471a7fa34 [formerly 60aeb71652]]
Former-commit-id: 1471a7fa34
Former-commit-id: 60850d6f8a
This commit is contained in:
David Gillingham 2013-05-22 11:42:08 -05:00
parent 99fbec36cd
commit e426037c09
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscScript.java
View file

@ -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.
*
* </pre>
*
@ -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 + "')");
}

3
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/IrtServer.py
View file

@ -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

3
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
View file

@ -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):

2
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
View file

@ -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):