();
+ args.put("siteID", determineSiteId(request.getSiteID()));
+ args.put("userID", request.getUserID());
+ args.put("databaseID", request.getDatabaseID().toString());
+ args.put("parmsToProcess", request.getParmsToProcess());
+ args.put("blankOtherPeriods", request.isBlankOtherPeriods());
+ args.put("startTime", request.getStartTime());
+ args.put("endTime", request.getEndTime());
+ args.put("altMask", request.getAltMask());
+ args.put("replaceOnly", request.isReplaceOnly());
+ args.put("eraseFirst", request.isEraseFirst());
+ args.put("announce", request.getAnnounce());
+ args.put("renameWE", request.isRenameWE());
+ args.put("iscSends", request.isIscSends());
+ args.put("inFiles", request.getInFiles());
+ args.put("ignoreMask", request.isIgnoreMask());
+ args.put("adjustTranslate", request.isAdjustTranslate());
+ args.put("deleteInput", request.isDeleteInput());
+ args.put("parmsToIgnore", request.getParmsToIgnore());
+ args.put("gridDelay", request.getGridDelay());
+ args.put("logFileName", request.getLogFileName());
- if (!retVal.equals(GfeScriptExecutor.SUCCESS)) {
+ IscScriptExecutor executor = new IscScriptExecutor(METHOD_NAME,
+ request.getSiteID(), args);
+ String retVal = threadPool.submitSyncJob(executor);
+
+ if (retVal != null) {
sr.addMessage(retVal);
+ return sr;
}
+ sr.setPayload(Boolean.TRUE);
return sr;
}
+
+ private String determineSiteId(String inputSite) {
+ if ((inputSite == null) || inputSite.isEmpty()) {
+ return SiteUtil.getSite();
+ } else {
+ return inputSite;
+ }
+ }
}
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 88b0d83d54..437cf96733 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
@@ -20,7 +20,7 @@
import cPickle
-import LogStream, siteConfig, tempfile, os, sys, JUtil, subprocess, traceback
+import LogStream, tempfile, os, sys, JUtil, subprocess, traceback
import time, copy, string, iscUtil
from com.raytheon.edex.plugin.gfe.isc import IRTManager
@@ -39,6 +39,9 @@ from com.raytheon.edex.plugin.gfe.isc import IRTManager
# 01/25/13 1447 dgilling Implement routines needed by
# iscDataRec for VTEC table
# sharing.
+# 03/13/13 1759 dgilling Move siteConfig imports into
+# functions where module is used
+# to interact better with IscScript.
#
#
#
@@ -64,7 +67,9 @@ def logDebug(*msg):
# called by iscDataRec when another site has requested the active table
# returns the active table, filtered, pickled.
def getVTECActiveTable(siteAndFilterInfo, xmlPacket):
+ import siteConfig
import VTECPartners
+
if not VTECPartners.VTEC_RESPOND_TO_TABLE_REQUESTS:
return #respond is disabled
@@ -154,6 +159,8 @@ def getVTECActiveTable(siteAndFilterInfo, xmlPacket):
#when we receive a requested active table from another site, this function
#is called from iscDataRec
def putVTECActiveTable(strTable, xmlPacket):
+ import siteConfig
+
#write the xmlpacket to a temporary file, if one was passed
inDir = os.path.join(siteConfig.GFESUITE_PRDDIR, "ATBL")
if xmlPacket is not None:
@@ -351,6 +358,7 @@ def serviceISCRequest(xmlRequest):
# We take this information, convert it into a different format,
# and queue the request via the IFPServer to the SendISCMgr
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 b3cb2c73c4..e3f01a7810 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
@@ -60,6 +60,7 @@ from com.raytheon.uf.common.localization import LocalizationContext_Localization
# Date Ticket# Engineer Description
# ------------ ---------- ----------- --------------------------
# 07/06/09 1995 bphillip Initial Creation.
+# 03/11/13 1759 dgilling Removed unneeded methods.
#
#
#
@@ -67,52 +68,6 @@ from com.raytheon.uf.common.localization import LocalizationContext_Localization
BATCH_WRITE_COUNT = 10
BATCH_DELAY = 0.0
-
-###-------------------------------------------------------------------------###
-### Prints the usage message
-def usage():
- print """
- -h hostname: Host name upon which the ifpServer is running.
- -r RPC port: RPC port upon which the ifpServer is running.
- -u userID: The user ID to connect with
- -o output file: Specifies the name of the output file.
- -d database id: DatabaseID from which to get the data.
- format: (DEN_GRID__eta_19980604_1200)
- -p parmName: Optional. If none specified, get all parms for
- the database listed. There may be several
- parm names specified.
- -s start time: Optional. If no start time specified,
- make start time = 0.
- format: YYYYMMDD_HHMM (e.g. 19980604_1200)
- -e end time: Optional. If no end time specified, make end
- time = Abstime::MaxFutureTime().
- format: (19980604_1200)
- -m mask Optional. Specifies the edit area to be used
- as the clip mask. If no mask was specified
- then the entire domain will be used. All
- values outside the mask will be assigned
- a missing value.
- -t [no argument] Optional. If present, trim data resolution.
- -g [no argument] Optional. If present, topography, latitude
- and longitude grids will be stored.
- -c [no argument] Optional. If present, the netCDF file will be
- compressed by the gzip.
- -f factor Optional. When provided in conjunction with the -c switch,
- provides the compression factor of gzip (1-9). Default
- is 6.
- -k [no argument] Optional. If present, the netCDF file is really
- shrunk, by using bytes and shorts to represent floats.
- Requires the -t switch.
- -C configIntervalFilename
- Optional. If present, controls the interval/spacing of
- the grids. Identifies a configuration file defining
- the timing constraints. The filename identifies a
- file within the ifpServer TEXT/Utility directory and
- must be a Python file.
-
-"""
-
-
ifpNetcdfLogger=None
## Logging methods ##
@@ -135,135 +90,7 @@ def logVerbose(*msg):
def logDebug(*msg):
logVerbose(iscUtil.tupleToString(*msg))
-
-###-------------------------------------------------------------------------###
-### Parses the command line options and saves the data in argDict
-def getArgs(argv):
- try:
- optlist, args = getopt.getopt(argv[1:],
- 'v:h:r:o:p:d:s:e:u:m:gctkf:C:')
- # optlist, args = getopt.getopt(sys.argv[1:],
- # 'h:r:o:p:d:s:e:u:m:gctkf:C:')
- except getopt.error, val:
- print val
- usage()
- return
- # initialize input arguments
- host = ""
- port = -1
- outputFilename = ""
- parmList = []
- databaseID = ""
- startTime = ""
- endTime = ""
- mask = ""
- geoInfo = 0
- compressFile = 0
- trim = 0
- userID = "SITE"
- krunch = 0
- compressFileFactor = 6
- configFileName = None
- logFile=None
-
- try:
- import siteConfig
- host = siteConfig.GFESUITE_SERVER
- port = int(siteConfig.GFESUITE_PORT)
- except:
- pass
-
- for opt in optlist:
- if opt[0] == '-h':
- host = opt[1]
- elif opt[0] == '-r':
- port = int(opt[1])
- elif opt[0] == '-o':
- outputFilename = opt[1]
- elif opt[0] == '-C':
- configFileName = opt[1]
- elif opt[0] == '-p':
- p = opt[1]
- # Add SFC if necessary
- if string.find(p, "_SFC") == -1:
- p = p + "_SFC"
- if p not in parmList:
- parmList.append(p)
- elif opt[0] == '-d':
- databaseID = opt[1]
- elif opt[0] == '-u':
- userID = opt[1]
- elif opt[0] == '-s':
- startTime = opt[1]
- elif opt[0] == '-f':
- compressFileFactor = int(opt[1])
- elif opt[0] == '-e':
- endTime = opt[1]
- elif opt[0] == '-m':
- mask = opt[1]
- elif opt[0] == '-g':
- geoInfo = 1
- elif opt[0] == '-t':
- trim = 1
- elif opt[0] == '-k':
- krunch = 1
- elif opt[0] == '-c':
- compressFile = 1
- elif opt[0] == '-v':
- logFile=opt[1]
-
- # Create dictionary of arguments
- argDict = {
- "host" : host,
- "port" : port,
- "outputFilename": outputFilename,
- "parmList": parmList,
- "databaseID": databaseID,
- "startTime": startTime,
- "endTime": endTime,
- "mask": mask,
- "geoInfo": geoInfo,
- "compressFile" : compressFile,
- "configFileName" : configFileName,
- "compressFileFactor" : compressFileFactor,
- "trim" : trim,
- "krunch" : krunch,
- "userID" : userID,
- "logFile" : logFile,
- }
- return argDict
-
-###-------------------------------------------------------------------------###
-### Checks each argument and takes action where appropriate
-def checkArgs(argDict):
- if argDict['host'] == '':
- usage()
- logProblem("You must specify an ifpServer host name.")
- raise Exception, "You must specify an ifpServer host name."
- if argDict['port'] == -1:
- usage()
- logProblem("You must specify an ifpServer port number.")
- raise Exception, "You must specify an ifpServer port number."
- if argDict['databaseID'] == '':
- usage()
- logProblem("You must specify a database id.")
- raise Exception, "You must specify a database id."
- if argDict['outputFilename'] == '':
- argDict['outputFilename'] = 'ifpnetCDFFile.cdf'
-
- # validate start/end times
- if argDict['startTime'] == '':
- argDict['startTime'] = '19700101_0000'
- if argDict['endTime'] == '':
- argDict['endTime'] = '20371231_2359'
-
- # must have trim, if krunch specified
- if argDict['krunch'] == 1 and argDict['trim'] == 0:
- argDict['krunch'] = 0
-
-
- return argDict
class WECache(object):
def __init__(self, we, inv):
@@ -1474,24 +1301,39 @@ def determineSamplingValues(samplingDef, parmName, inventory, currentTime):
return inven
-
-
-
-def executeIfpNetCDF(host, port, outputFilename, parmList, databaseID, startTime, endTime, mask, geoInfo, compressFileFlag, configFileName, compressFileFactor, trim, krunch, userID):
-
- if ifpNetcdfLogger is None:
- initLogger()
-
- if type(parmList) != list:
- parmList = JUtil.javaStringListToPylist(parmList)
-
- argDict = {"host":host, "port":port, "outputFilename":outputFilename, "parmList":parmList,
- "databaseID":databaseID, "startTime":startTime, "endTime":endTime, "mask":mask,
- "geoInfo":geoInfo, "compressFile":compressFileFlag, "configFileName":configFileName,
- "compressFileFactor":compressFileFactor, "trim":trim, "krunch":krunch, "userID":userID}
-
- argDict = checkArgs(argDict)
+###-------------------------------------------------------------------------###
+### Main program
+def main(outputFilename, parmList, databaseID, startTime,
+ endTime, mask, geoInfo, compressFileFlag, configFileName,
+ compressFileFactor, trim, krunch, userID, logFileName):
+ initLogger(logFileName)
+
+# LogStream.ttyLogOn()
+ logEvent("ifpnetCDF Starting")
+# LogStream.logEvent(AFPS.DBSubsystem_getBuildDate(),
+# AFPS.DBSubsystem_getBuiltBy(), AFPS.DBSubsystem_getBuiltOn(),
+# AFPS.DBSubsystem_getBuildVersion())
+
+ try:
+ len(parmList)
+ except TypeError:
+ parmList = JUtil.javaObjToPyVal(parmList)
+ argDict = {"outputFilename": outputFilename,
+ "parmList": parmList,
+ "databaseID": databaseID,
+ "startTime": startTime,
+ "endTime": endTime,
+ "mask": mask,
+ "geoInfo": bool(geoInfo),
+ "compressFile": bool(compressFileFlag),
+ "configFileName": configFileName,
+ "compressFileFactor": int(compressFileFactor),
+ "trim": bool(trim),
+ "krunch": bool(krunch),
+ "userID": userID}
+ logEvent("Command: ", argDict)
+
a = os.times()
cpu0 = a[0] + a[1]
start = a[4]
@@ -1500,7 +1342,7 @@ def executeIfpNetCDF(host, port, outputFilename, parmList, databaseID, startTime
try:
timeRange = makeTimeRange(argDict['startTime'], argDict['endTime'])
except:
- return
+ sys.exit(1)
# See if the databaseID is valid. An exception will be tossed
db = IFPDB(argDict['databaseID'])
@@ -1617,34 +1459,12 @@ def executeIfpNetCDF(host, port, outputFilename, parmList, databaseID, startTime
"%-.2f" % (stop - stop1), "/", "%-.2f" % (cpugz - cpu), "compress,",
"%-.2f" % (stop - start), "/", "%-.2f" % (cpugz - cpu0), "total")
#logEvent("stats: ", client.getStats())
-
-
-
-###-------------------------------------------------------------------------###
-### Main program
-def main(argv):
-
- #LogStream.logEvent(AFPS.DBSubsystem_getBuildDate(),
- # AFPS.DBSubsystem_getBuiltBy(), AFPS.DBSubsystem_getBuiltOn(),
- # AFPS.DBSubsystem_getBuildVersion())
-
- if type(argv) is not list:
- argv = JUtil.javaStringListToPylist(argv)
- argDict = getArgs(argv)
-
- initLogger(argDict["logFile"])
- logEvent("ifpnetCDF Starting")
- logEvent("Command: ",iscUtil.tupleToString(*argv))
-
- executeIfpNetCDF(argDict["host"], argDict["port"], argDict["outputFilename"], argDict["parmList"], argDict["databaseID"],
- argDict["startTime"], argDict["endTime"], argDict["mask"], argDict["geoInfo"], argDict["compressFile"],
- argDict["configFileName"], argDict["compressFileFactor"], argDict["trim"], argDict["krunch"], argDict["userID"])
-
logEvent("ifpnetCDF Finished")
-if __name__ == "__main__":
- pass
- #main()
+
+
+#if __name__ == "__main__":
+# main()
# profile stuff
# import profile, pstats
# profile.run('main()', 'pyprof.out')
@@ -1652,4 +1472,3 @@ if __name__ == "__main__":
# p.strip_dirs()
# p.sort_stats('time', 'calls').print_stats(15)
# p.print_callers(15)
-
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscDataRec.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscDataRec.py
index fa093e3ca6..fa25560fbb 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscDataRec.py
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscDataRec.py
@@ -3,20 +3,20 @@
##
# This software was developed and / or modified by Raytheon Company,
-# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
-#
-# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+#
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
# This software product contains export-restricted data whose
# export/transfer/disclosure is restricted by U.S. law. Dissemination
# to non-U.S. persons whether in the United States or abroad requires
# an export license or other authorization.
#
-# Contractor Name: Raytheon Company
-# Contractor Address: 6825 Pine Street, Suite 340
-# Mail Stop B8
-# Omaha, NE 68106
-# 402.291.0100
-#
+# Contractor Name: Raytheon Company
+# Contractor Address: 6825 Pine Street, Suite 340
+# Mail Stop B8
+# Omaha, NE 68106
+# 402.291.0100
+#
# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
# further licensing information.
##
@@ -41,7 +41,7 @@ exec $GFESUITE_HOME/bin/run/iscDataRec1 -S -O $0 ${1+"$@"}
import iscMosaic,iscUtil
import os, stat, sys, re, string, traceback, types
-import time, xml, LogStream, siteConfig, IrtAccess
+import time, xml, LogStream, IrtAccess
import IrtServer
from xml.etree import ElementTree
from xml.etree.ElementTree import Element, SubElement
@@ -57,6 +57,9 @@ from java.util import ArrayList
# ------------ ---------- ----------- --------------------------
# 07/06/09 1995 bphillip Initial Creation.
# 01/29/13 1447 dgilling Implement VTEC table sharing.
+# 03/12/13 1759 dgilling Bypass command-line processing
+# for iscMosaic, support changes
+# to IscReceiveSrv.
#
#
#
@@ -94,7 +97,8 @@ def purgeFiles(msgid, files):
def execIscDataRec(MSGID,SUBJECT,FILES):
-
+ import siteConfig
+
try:
# logEvent('*** iscDataRec ***', sys.argv[1:])
logEvent('SUBJECT:', SUBJECT, 'MSGID:', MSGID,"FILES:",FILES)
@@ -208,29 +212,26 @@ def execIscDataRec(MSGID,SUBJECT,FILES):
elif SUBJECT == 'GET_ACTIVE_TABLE2':
IrtServer.getVTECActiveTable(fpData, xmlFileBuf)
elif SUBJECT in ['ISCGRIDS', 'ISCGRIDS2']:
- files = ArrayList()
- files.add(dataFile)
-
- args = []
- args.append(" ")
- args.append("-h")
- args.append(siteConfig.GFESUITE_SERVER)
- args.append("-r")
- args.append(siteConfig.GFESUITE_PORT)
- args.append("-d")
- args.append(siteConfig.GFESUITE_SITEID+"_GRID__ISC_00000000_0000")
- args.append("-T")
- args.append("-b")
-
- for i in range(0,files.size()):
- args.append("-f")
- args.append(files.get(i))
-
- args.append("-w")
- args.append("ISC: ")
- args.append("-k")
- args.append("-o")
-
+ args = {"siteID": siteConfig.GFESUITE_SITEID,
+ "userID": 'SITE',
+ "databaseID": siteConfig.GFESUITE_SITEID+"_GRID__ISC_00000000_0000",
+ "parmsToProcess": [],
+ "blankOtherPeriods": True,
+ "startTime": None,
+ "endTime": None,
+ "altMask": None,
+ "replaceOnly": False,
+ "eraseFirst": False,
+ "announce": "ISC: ",
+ "renameWE": True,
+ "iscSends": False,
+ "inFiles": [dataFile],
+ "ignoreMask": False,
+ "adjustTranslate": True,
+ "deleteInput": True,
+ "parmsToIgnore": [],
+ "gridDelay": 0.0,
+ "logFileName": None}
mosaic = iscMosaic.IscMosaic(args)
mosaic.execute()
@@ -276,14 +277,14 @@ def execIscDataRec(MSGID,SUBJECT,FILES):
def main(argv):
initLogger()
try:
- if type(argv) != 'list':
+ if type(argv) is not list:
import JUtil
- argv = JUtil.javaStringListToPylist(argv)
- logEvent('*** iscDataRec ***', argv[1:])
+ argv = JUtil.javaObjToPyVal(argv)
+ logEvent('*** iscDataRec ***', argv)
try:
- MSGID = argv[1]
- SUBJECT = argv[2]
- FILES = argv[3].split(',')
+ MSGID = argv[0]
+ SUBJECT = argv[1]
+ FILES = argv[2].split(',')
logEvent('SUBJECT:', SUBJECT, 'MSGID:', MSGID)
#log the incoming files and size
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscExtract.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscExtract.py
index bb1faeef43..f64ebfc9a7 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscExtract.py
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscExtract.py
@@ -52,6 +52,7 @@ from com.vividsolutions.jts.geom import Coordinate
# Date Ticket# Engineer Description
# ------------ ---------- ----------- --------------------------
# 07/06/09 1995 bphillip Initial Creation.
+# 03/12/13 1759 dgilling Change how ifpnetCDF is called.
#
#
#
@@ -425,38 +426,22 @@ def executeIscExtract(parmNames, databaseName, startTime, endTime,
else: #no clipping, or different projection
maskName = "ISC_Send_Area"
- # Run ifpnetCDF for the data
- argv = []
- argv.append("ifpnetCDF")
- argv.append("-h")
- argv.append(siteConfig.GFESUITE_SERVER)
- argv.append("-r")
- argv.append(siteConfig.GFESUITE_PORT)
- argv.append("-o")
- argv.append(fname)
- argv.append("-C")
- argv.append("iscSendSampleDef")
- for p in dest['parms']:
- argv.append("-p")
- argv.append(p)
-
- argv.append("-d")
- argv.append(dbid)
- argv.append("-s")
- argv.append(startTR)
- argv.append("-e")
- argv.append(endTR)
- argv.append("-m")
- argv.append(maskName)
- argv.append("-c")
- argv.append("-f")
- argv.append("6")
- argv.append("-t")
- argv.append("-k")
- argv.append("-u")
- argv.append("iscExtract")
-
- ifpnetCDF.main(argv)
+ # Run ifpnetCDF for the data
+ argv = {"outputFilename": fname,
+ "parmList": dest['parms'],
+ "databaseID": dbid,
+ "startTime": startTR,
+ "endTime": endTR,
+ "mask": maskName,
+ "geoInfo": False,
+ "compressFileFlag": True,
+ "configFileName": "iscSendSampleDef",
+ "compressFileFactor": 6,
+ "trim": True,
+ "krunch": True,
+ "userID": "iscExtract",
+ "logFileName": None}
+ ifpnetCDF.main(**argv)
fname = fname + '.gz'
size = os.stat(fname)[stat.ST_SIZE]
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 3a2aafc21e..5d92198fe2 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
@@ -72,7 +72,9 @@ from com.raytheon.uf.edex.database.cluster import ClusterTask
# Date Ticket# Engineer Description
# ------------ ---------- ----------- --------------------------
# 07/06/09 1995 bphillip Initial Creation.
-# 01/17/13 15588 jdynina Fixed Publish history removal
+# 01/17/13 15588 jdynina Fixed Publish history removal
+# 03/12/13 1759 dgilling Remove unnecessary command line
+# processing.
#
#
@@ -192,32 +194,37 @@ class IscMosaic:
self.__logger=iscUtil.getLogger("iscMosaic",self.__logFile)
def __init__(self, args):
- import siteConfig
- self.__host = 0
- self.__port = 0
- self.__userID = 'SITE'
-
+ self.__mysite = args['siteID']
+ self.__userID = args['userID']
self.__db = None # ifpServer database object
self.__dbGrid = None
- self.__parmsToProcess = []
- self.__blankOtherPeriods = 0
- self.__processTimePeriod = None
- self.__altMask = None
- self.__replaceOnly = 0
- self.__eraseFirst = 0
- self.__announce = ""
- self.__renameWE = 0
- self.__iscSends = 0
- self.__databaseID = ''
- self.__inFiles = []
- self.__ignoreMask = 0
- self.__adjustTranslate = 0
- self.__deleteInput = 0
- self.__parmsToIgnore = []
- self.__gridDelay = 0.0
- self.__logFile = None
+ self.__parmsToProcess = args['parmsToProcess']
+ self.__blankOtherPeriods = args['blankOtherPeriods']
+ self.__altMask = args['altMask']
+ self.__replaceOnly = args['replaceOnly']
+ self.__eraseFirst = args['eraseFirst']
+ self.__announce = args['announce']
+ self.__renameWE = args['renameWE']
+ self.__iscSends = args['iscSends']
+ if args['databaseID'] is not None:
+ self.__databaseID = args['databaseID']
+ else:
+ self.__databaseID = self.__mysite + "_GRID__ISC_00000000_0000"
+ self.__inFiles = args['inFiles']
+ self.__ignoreMask = args['ignoreMask']
+ self.__adjustTranslate = args['adjustTranslate']
+ self.__deleteInput = args['deleteInput']
+ self.__parmsToIgnore = args['parmsToIgnore']
+ self.__gridDelay = args['gridDelay']
+ self.__logFile = args['logFileName']
- self.__getArgs(args)
+ startTime = 0
+ if args['startTime'] is not None:
+ startTime = self.__decodeTimeString(args['startTime'])
+ endTime = int(2 ** 30 - 1 + 2 ** 30)
+ if args['endTime'] is not None:
+ endTime = self.__decodeTimeString(args['endTime'])
+ self.__processTimePeriod = (startTime, endTime)
self.__initLogger()
@@ -236,97 +243,6 @@ class IscMosaic:
def logDebug(self,*msg):
self.logVerbose(iscUtil.tupleToString(*msg))
-
-
- #------------------------------------------------------------------------
- # Read command line arguments
- #------------------------------------------------------------------------
- def __getArgs(self, args):
-
- try:
- optlist, args = getopt.getopt(args[1:],
- 'v:h:r:d:p:u:f:bs:e:xzkna:w:i:D:oST')
- except getopt.error, val:
- print val
- return
- startTime = 0
- endTime = int(2 ** 30 - 1 + 2 ** 30)
-
- import siteConfig
- try:
- self.__host = siteConfig.GFESUITE_SERVER
- self.__port = int(siteConfig.GFESUITE_PORT)
- self.__mysite = siteConfig.GFESUITE_SITEID
- self.__databaseID = self.__mysite + "_GRID__ISC_00000000_0000"
- except:
- pass
-
- for opt in optlist:
- if opt[0] == '-h':
- self.__host = opt[1]
- if opt[0] == '-a':
- self.__altMask = opt[1]
- elif opt[0] == '-r':
- self.__port = int(opt[1])
- elif opt[0] == '-b':
- self.__blankOtherPeriods = 1
- elif opt[0] == '-u':
- self.__userID = opt[1]
- elif opt[0] == '-T':
- self.__adjustTranslate = 1
- elif opt[0] == '-k':
- self.__deleteInput = 1
- elif opt[0] == '-d':
- self.__databaseID = opt[1]
- elif opt[0] == '-D':
- self.__gridDelay = float(opt[1])
- elif opt[0] == '-p':
- p = opt[1]
- # add SFC if necessary
- if string.find(p, "_SFC") == -1:
- p = p + "_SFC"
- if p not in self.__parmsToProcess:
- self.__parmsToProcess.append(p)
- elif opt[0] == '-i':
- i = opt[1]
- # add SFC if necessary
- if string.find(i, "_SFC") == -1:
- i = i + "_SFC"
- if i not in self.__parmsToIgnore:
- self.__parmsToIgnore.append(i)
- elif opt[0] == '-f':
- self.__inFiles.append(opt[1])
- elif opt[0] == '-s':
- startTime = self.__decodeTimeString(opt[1])
- elif opt[0] == '-e':
- endTime = self.__decodeTimeString(opt[1])
- elif opt[0] == '-z':
- self.__eraseFirst = 1
- elif opt[0] == '-x':
- self.__replaceOnly = 1
- elif opt[0] == '-w':
- self.__announce = opt[1]
- elif opt[0] == '-o':
- self.__renameWE = 1
- elif opt[0] == '-n':
- self.__ignoreMask = 1
- elif opt[0] == '-S':
- self.__iscSends = 1
- elif opt[0] == '-v':
- self.__logFile = opt[1]
-
- if len(self.__inFiles) > 1 and self.__eraseFirst == 1:
- self.logProblem(\
- "Multiple input files [-f switches] and -z switch not compatible")
- raise Exception, "Bad command line"
-
- if self.__ignoreMask == 1 and self.__altMask is not None:
- self.logProblem(\
- "-n and -a altMask switches not compatible")
- raise Exception, "Bad command line"
-
- self.__inFiles = JUtil.pyValToJavaObj(self.__inFiles)
- self.__processTimePeriod = (startTime, endTime)
def execute(self):
self.logEvent("iscMosaic Starting")
@@ -348,12 +264,12 @@ class IscMosaic:
self.__myOfficeType = IFPServerConfigManager.getServerConfig(DatabaseID(self.__databaseID).getSiteId()).officeType()
#process each input file
- for i in range(0, self.__inFiles.size()):
+ for file in self.__inFiles:
self.__areaMask = None
- self.__processInputFile(str(self.__inFiles.get(i)))
+ self.__processInputFile(file)
if self.__deleteInput:
- os.remove(str(self.__inFiles.get(i)))
+ os.remove(file)
self.logEvent("iscMosaic Finished")
@@ -1540,9 +1456,43 @@ class IscMosaic:
self.__dbGrid = None
-def main(argv):
- if type(argv) != 'list':
- argv = JUtil.javaStringListToPylist(argv)
+
+def convertList(unknownList):
+ retVal = unknownList
+ try:
+ len(unknownList)
+ except TypeError:
+ retVal = JUtil.javaObjToPyVal(unknownList)
+ return retVal
+
+def main(siteID, userID, databaseID, parmsToProcess, blankOtherPeriods,
+ startTime, endTime, altMask, replaceOnly, eraseFirst,
+ announce, renameWE, iscSends, inFiles, ignoreMask,
+ adjustTranslate, deleteInput, parmsToIgnore, gridDelay, logFileName):
+ # convert Java types to python and send to IscMosaic for execution
+ parmsToProcess = convertList(parmsToProcess)
+ inFiles = convertList(inFiles)
+ parmsToIgnore = convertList(parmsToIgnore)
+ argv = {"siteID": siteID,
+ "userID": userID,
+ "databaseID": databaseID,
+ "parmsToProcess": parmsToProcess,
+ "blankOtherPeriods": bool(blankOtherPeriods),
+ "startTime": startTime,
+ "endTime": endTime,
+ "altMask": altMask,
+ "replaceOnly": bool(replaceOnly),
+ "eraseFirst": bool(eraseFirst),
+ "announce": announce,
+ "renameWE": bool(renameWE),
+ "iscSends": bool(iscSends),
+ "inFiles": inFiles,
+ "ignoreMask": bool(ignoreMask),
+ "adjustTranslate": bool(adjustTranslate),
+ "deleteInput": bool(deleteInput),
+ "parmsToIgnore": parmsToIgnore,
+ "gridDelay": float(gridDelay),
+ "logFileName": logFileName}
mosaic = IscMosaic(argv)
mosaic.execute()
mosaic = None
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
index ef78946aa5..9d8f9256d2 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
@@ -23,7 +23,6 @@ import xml, pickle, tempfile, os
from xml.etree import ElementTree
from xml.etree.ElementTree import Element, SubElement
import LogStream
-import siteConfig
from datetime import datetime
from time import gmtime,strftime
from java.io import File
@@ -48,6 +47,8 @@ from com.raytheon.uf.common.localization import LocalizationContext_Localization
# Date Ticket# Engineer Description
# ------------ ---------- ----------- --------------------------
# 07/06/09 1995 bphillip Initial Creation.
+# 03/11/13 1759 dgilling Move siteConfig import into
+# methods where it's needed.
#
#
#
@@ -279,6 +280,12 @@ def getRequestXML(xml,selectedServers, selectedWEList):
def getLogger(scriptName, logName=None):
import logging
+ # be relocating this import here we allow
+ # com.raytheon.edex.plugin.gfe.isc.IscScript to dynamically
+ # modify its include path with the proper siteConfig just before
+ # execution time
+ import siteConfig
+
if logName is None:
logPath=siteConfig.GFESUITE_LOGDIR+"/"+strftime("%Y%m%d", gmtime())
logName=scriptName+".log"
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
index 9692e3e6ba..eb0a043487 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
@@ -37,6 +37,7 @@ import com.raytheon.uf.common.util.FileUtil;
* Oct 9, 2008 njensen Initial creation
* Sep 18, 2012 #1091 randerso added base directory to getGfeConfigIncludePath
* Feb 27, 2013 #1447 dgilling Re-factor based on PythonPathIncludeUtil.
+ * Mar 11, 2013 #1759 dgilling Add method getGfeConfigLF().
*
*
* @author njensen
@@ -371,6 +372,10 @@ public class GfePyIncludeUtil extends PythonIncludePathUtil {
return PyUtil.buildJepIncludePath(siteConfigDir, baseConfigDir);
}
+ public static LocalizationFile getGfeConfigLF(LocalizationContext ctx) {
+ return PATH_MANAGER.getLocalizationFile(ctx, GFE_CONFIG);
+ }
+
public static String getVCModulesIncludePath() {
return getPath(PATH_MANAGER.getContext(LocalizationType.COMMON_STATIC,
LocalizationLevel.BASE), VCMODULES);
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/CreateNetCDFGridRequest.java b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/CreateNetCDFGridRequest.java
deleted file mode 100644
index 7c870eeec8..0000000000
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/CreateNetCDFGridRequest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- *
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- *
- * Contractor Name: Raytheon Company
- * Contractor Address: 6825 Pine Street, Suite 340
- * Mail Stop B8
- * Omaha, NE 68106
- * 402.291.0100
- *
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.uf.common.dataplugin.gfe.request;
-
-import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
-import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
-
-/**
- * TODO Add Description
- *
- *
- *
- * SOFTWARE HISTORY
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Sep 24, 2010 dgilling Initial creation
- *
- *
- *
- * @author dgilling
- * @version 1.0
- */
-
-@DynamicSerialize
-public class CreateNetCDFGridRequest extends AbstractGfeRequest {
-
- @DynamicSerializeElement
- private String argString;
-
- /**
- * @return the argString
- */
- public String getArgString() {
- return argString;
- }
-
- /**
- * @param argString
- * the argString to set
- */
- public void setArgString(String argString) {
- this.argString = argString;
- }
-}
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/ExecuteIfpNetCDFGridRequest.java b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/ExecuteIfpNetCDFGridRequest.java
new file mode 100644
index 0000000000..875753933d
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/ExecuteIfpNetCDFGridRequest.java
@@ -0,0 +1,237 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ *
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ *
+ * Contractor Name: Raytheon Company
+ * Contractor Address: 6825 Pine Street, Suite 340
+ * Mail Stop B8
+ * Omaha, NE 68106
+ * 402.291.0100
+ *
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.uf.common.dataplugin.gfe.request;
+
+import java.util.List;
+
+import com.raytheon.uf.common.dataplugin.gfe.db.objects.DatabaseID;
+import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
+import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
+
+/**
+ * Request object to run ifpnetCDF.
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * Sep 24, 2010 dgilling Initial creation
+ * Mar 11, 2013 #1759 dgilling Re-factoring to use fields instead
+ * of an argument string.
+ *
+ *
+ *
+ * @author dgilling
+ * @version 1.0
+ */
+
+@DynamicSerialize
+public class ExecuteIfpNetCDFGridRequest extends AbstractGfeRequest {
+
+ @DynamicSerializeElement
+ private String outputFilename;
+
+ @DynamicSerializeElement
+ private List parmList;
+
+ @DynamicSerializeElement
+ private DatabaseID databaseID;
+
+ @DynamicSerializeElement
+ private String startTime;
+
+ @DynamicSerializeElement
+ private String endTime;
+
+ @DynamicSerializeElement
+ private String mask;
+
+ @DynamicSerializeElement
+ private boolean geoInfo;
+
+ @DynamicSerializeElement
+ private boolean compressFile;
+
+ @DynamicSerializeElement
+ private String configFileName;
+
+ @DynamicSerializeElement
+ private int compressFileFactor;
+
+ @DynamicSerializeElement
+ private boolean trim;
+
+ @DynamicSerializeElement
+ private boolean krunch;
+
+ @DynamicSerializeElement
+ private String userID;
+
+ @DynamicSerializeElement
+ private String logFileName;
+
+ @Override
+ public String toString() {
+ StringBuilder builder = new StringBuilder();
+ builder.append("ExecuteIfpNetCDFGridRequest [outputFilename=");
+ builder.append(outputFilename);
+ builder.append(", parmList=");
+ builder.append(parmList);
+ builder.append(", databaseID=");
+ builder.append(databaseID);
+ builder.append(", startTime=");
+ builder.append(startTime);
+ builder.append(", endTime=");
+ builder.append(endTime);
+ builder.append(", mask=");
+ builder.append(mask);
+ builder.append(", geoInfo=");
+ builder.append(geoInfo);
+ builder.append(", compressFile=");
+ builder.append(compressFile);
+ builder.append(", configFileName=");
+ builder.append(configFileName);
+ builder.append(", compressFileFactor=");
+ builder.append(compressFileFactor);
+ builder.append(", trim=");
+ builder.append(trim);
+ builder.append(", krunch=");
+ builder.append(krunch);
+ builder.append(", userID=");
+ builder.append(userID);
+ builder.append(", logFileName=");
+ builder.append(logFileName);
+ builder.append("]");
+ return builder.toString();
+ }
+
+ public String getOutputFilename() {
+ return outputFilename;
+ }
+
+ public void setOutputFilename(String outputFilename) {
+ this.outputFilename = outputFilename;
+ }
+
+ public List getParmList() {
+ return parmList;
+ }
+
+ public void setParmList(List parmList) {
+ this.parmList = parmList;
+ }
+
+ public DatabaseID getDatabaseID() {
+ return databaseID;
+ }
+
+ public void setDatabaseID(DatabaseID databaseID) {
+ this.databaseID = databaseID;
+ }
+
+ public String getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(String startTime) {
+ this.startTime = startTime;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
+ public String getMask() {
+ return mask;
+ }
+
+ public void setMask(String mask) {
+ this.mask = mask;
+ }
+
+ public boolean isGeoInfo() {
+ return geoInfo;
+ }
+
+ public void setGeoInfo(boolean geoInfo) {
+ this.geoInfo = geoInfo;
+ }
+
+ public boolean isCompressFile() {
+ return compressFile;
+ }
+
+ public void setCompressFile(boolean compressFile) {
+ this.compressFile = compressFile;
+ }
+
+ public String getConfigFileName() {
+ return configFileName;
+ }
+
+ public void setConfigFileName(String configFileName) {
+ this.configFileName = configFileName;
+ }
+
+ public int getCompressFileFactor() {
+ return compressFileFactor;
+ }
+
+ public void setCompressFileFactor(int compressFileFactor) {
+ this.compressFileFactor = compressFileFactor;
+ }
+
+ public boolean isTrim() {
+ return trim;
+ }
+
+ public void setTrim(boolean trim) {
+ this.trim = trim;
+ }
+
+ public boolean isKrunch() {
+ return krunch;
+ }
+
+ public void setKrunch(boolean krunch) {
+ this.krunch = krunch;
+ }
+
+ public String getUserID() {
+ return userID;
+ }
+
+ public void setUserID(String userID) {
+ this.userID = userID;
+ }
+
+ public String getLogFileName() {
+ return logFileName;
+ }
+
+ public void setLogFileName(String logFileName) {
+ this.logFileName = logFileName;
+ }
+}
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/ExecuteIscMosaicRequest.java b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/ExecuteIscMosaicRequest.java
index cbc7ba64f4..5043258823 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/ExecuteIscMosaicRequest.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/ExecuteIscMosaicRequest.java
@@ -19,11 +19,14 @@
**/
package com.raytheon.uf.common.dataplugin.gfe.request;
+import java.util.List;
+
+import com.raytheon.uf.common.dataplugin.gfe.db.objects.DatabaseID;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
/**
- * TODO Add Description
+ * Request object to run iscMosaic.
*
*
*
@@ -31,6 +34,8 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Sep 20, 2010 dgilling Initial creation
+ * Mar 12, 2013 #1759 dgilling Re-factoring to use fields instead
+ * of an argument string.
*
*
*
@@ -42,21 +47,261 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
public class ExecuteIscMosaicRequest extends AbstractGfeRequest {
@DynamicSerializeElement
- private String argString;
+ private String userID;
- /**
- * @return the argString
- */
- public String getArgString() {
- return argString;
+ @DynamicSerializeElement
+ private DatabaseID databaseID;
+
+ @DynamicSerializeElement
+ private List parmsToProcess;
+
+ @DynamicSerializeElement
+ private boolean blankOtherPeriods;
+
+ @DynamicSerializeElement
+ private String startTime;
+
+ @DynamicSerializeElement
+ private String endTime;
+
+ @DynamicSerializeElement
+ private String altMask;
+
+ @DynamicSerializeElement
+ private boolean replaceOnly;
+
+ @DynamicSerializeElement
+ private boolean eraseFirst;
+
+ @DynamicSerializeElement
+ private String announce;
+
+ @DynamicSerializeElement
+ private boolean renameWE;
+
+ @DynamicSerializeElement
+ private boolean iscSends;
+
+ @DynamicSerializeElement
+ private List inFiles;
+
+ @DynamicSerializeElement
+ private boolean ignoreMask;
+
+ @DynamicSerializeElement
+ private boolean adjustTranslate;
+
+ @DynamicSerializeElement
+ private boolean deleteInput;
+
+ @DynamicSerializeElement
+ private List parmsToIgnore;
+
+ @DynamicSerializeElement
+ private float gridDelay;
+
+ @DynamicSerializeElement
+ private String logFileName;
+
+ @Override
+ public String toString() {
+ StringBuilder builder = new StringBuilder();
+ builder.append("ExecuteIscMosaicRequest [workstationID=");
+ builder.append(workstationID);
+ builder.append(", siteID=");
+ builder.append(siteID);
+ builder.append(", userID=");
+ builder.append(userID);
+ builder.append(", databaseID=");
+ builder.append(databaseID);
+ builder.append(", parmsToProcess=");
+ builder.append(parmsToProcess);
+ builder.append(", blankOtherPeriods=");
+ builder.append(blankOtherPeriods);
+ builder.append(", startTime=");
+ builder.append(startTime);
+ builder.append(", endTime=");
+ builder.append(endTime);
+ builder.append(", altMask=");
+ builder.append(altMask);
+ builder.append(", replaceOnly=");
+ builder.append(replaceOnly);
+ builder.append(", eraseFirst=");
+ builder.append(eraseFirst);
+ builder.append(", announce=");
+ builder.append(announce);
+ builder.append(", renameWE=");
+ builder.append(renameWE);
+ builder.append(", iscSends=");
+ builder.append(iscSends);
+ builder.append(", inFiles=");
+ builder.append(inFiles);
+ builder.append(", ignoreMask=");
+ builder.append(ignoreMask);
+ builder.append(", adjustTranslate=");
+ builder.append(adjustTranslate);
+ builder.append(", deleteInput=");
+ builder.append(deleteInput);
+ builder.append(", parmsToIgnore=");
+ builder.append(parmsToIgnore);
+ builder.append(", gridDelay=");
+ builder.append(gridDelay);
+ builder.append(", logFileName=");
+ builder.append(logFileName);
+ builder.append("]");
+ return builder.toString();
}
- /**
- * @param argString
- * the argString to set
- */
- public void setArgString(String argString) {
- this.argString = argString;
+ public String getUserID() {
+ return userID;
+ }
+
+ public void setUserID(String userID) {
+ this.userID = userID;
+ }
+
+ public DatabaseID getDatabaseID() {
+ return databaseID;
+ }
+
+ public void setDatabaseID(DatabaseID databaseID) {
+ this.databaseID = databaseID;
+ }
+
+ public List getParmsToProcess() {
+ return parmsToProcess;
+ }
+
+ public void setParmsToProcess(List parmsToProcess) {
+ this.parmsToProcess = parmsToProcess;
+ }
+
+ public boolean isBlankOtherPeriods() {
+ return blankOtherPeriods;
+ }
+
+ public void setBlankOtherPeriods(boolean blankOtherPeriods) {
+ this.blankOtherPeriods = blankOtherPeriods;
+ }
+
+ public String getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(String startTime) {
+ this.startTime = startTime;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
+ public String getAltMask() {
+ return altMask;
+ }
+
+ public void setAltMask(String altMask) {
+ this.altMask = altMask;
+ }
+
+ public boolean isReplaceOnly() {
+ return replaceOnly;
+ }
+
+ public void setReplaceOnly(boolean replaceOnly) {
+ this.replaceOnly = replaceOnly;
+ }
+
+ public boolean isEraseFirst() {
+ return eraseFirst;
+ }
+
+ public void setEraseFirst(boolean eraseFirst) {
+ this.eraseFirst = eraseFirst;
+ }
+
+ public String getAnnounce() {
+ return announce;
+ }
+
+ public void setAnnounce(String announce) {
+ this.announce = announce;
+ }
+
+ public boolean isRenameWE() {
+ return renameWE;
+ }
+
+ public void setRenameWE(boolean renameWE) {
+ this.renameWE = renameWE;
+ }
+
+ public boolean isIscSends() {
+ return iscSends;
+ }
+
+ public void setIscSends(boolean iscSends) {
+ this.iscSends = iscSends;
+ }
+
+ public List getInFiles() {
+ return inFiles;
+ }
+
+ public void setInFiles(List inFiles) {
+ this.inFiles = inFiles;
+ }
+
+ public boolean isIgnoreMask() {
+ return ignoreMask;
+ }
+
+ public void setIgnoreMask(boolean ignoreMask) {
+ this.ignoreMask = ignoreMask;
+ }
+
+ public boolean isAdjustTranslate() {
+ return adjustTranslate;
+ }
+
+ public void setAdjustTranslate(boolean adjustTranslate) {
+ this.adjustTranslate = adjustTranslate;
+ }
+
+ public boolean isDeleteInput() {
+ return deleteInput;
+ }
+
+ public void setDeleteInput(boolean deleteInput) {
+ this.deleteInput = deleteInput;
+ }
+
+ public List getParmsToIgnore() {
+ return parmsToIgnore;
+ }
+
+ public void setParmsToIgnore(List parmsToIgnore) {
+ this.parmsToIgnore = parmsToIgnore;
+ }
+
+ public float getGridDelay() {
+ return gridDelay;
+ }
+
+ public void setGridDelay(float gridDelay) {
+ this.gridDelay = gridDelay;
+ }
+
+ public void setLogFileName(String logFileName) {
+ this.logFileName = logFileName;
+ }
+
+ public String getLogFileName() {
+ return logFileName;
}
}
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpnetcdf/ifpnetCDF.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpnetcdf/ifpnetCDF.py
index 36744516eb..ce4b8818dd 100755
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpnetcdf/ifpnetCDF.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpnetcdf/ifpnetCDF.py
@@ -18,14 +18,6 @@
# further licensing information.
##
-from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import CreateNetCDFGridRequest
-from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
-from dynamicserialize import DynamicSerializationManager
-import sys
-import os
-from ufpy import ThriftClient
-from ufpy.UsageOptionParser import UsageOptionParser
-
#
# Provides a command-line utility to export selected grids to netCDF format.
#
@@ -35,82 +27,83 @@ from ufpy.UsageOptionParser import UsageOptionParser
# Date Ticket# Engineer Description
# ------------ ---------- ----------- --------------------------
# 09/23/10 dgilling Initial Creation.
+# 03/07/13 1759 dgilling Populate siteID field of
+# request based on specified
+# DatabaseID.
#
#
#
-def main():
- (options, args) = validateArgs()
- for i in range(1,4):
- print >> sys.stderr, "Attempt number: ", i
-
- try:
- netCdfRequest = createRequest()
- netCdfRequest.setArgString(netCdfRequest.getArgString() + " -h " + options.host + " -r " + str(options.port))
- thriftClient = ThriftClient.ThriftClient(options.host, options.port, "/services")
- serverResponse = thriftClient.sendRequest(netCdfRequest)
- except Exception, e:
- print >> sys.stderr, "Unhandled exception thrown during ifpnetCDF processing: \n", str(e)
- sys.exit(1)
-
- if (serverResponse.isOkay()):
- break
- else:
- print >> sys.stderr, "Errors occurred during ifpnetCDF processing: ", serverResponse.message()
-
- if (i == 3):
- print >> sys.stderr, "Final attempt failed - exiting"
- sys.exit(1)
+import logging
+import os
+import sys
+
+from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import ExecuteIfpNetCDFGridRequest
+from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
+from ufpy import ThriftClient
+from ufpy import UsageArgumentParser
+from ufpy.UsageArgumentParser import StoreDatabaseIDAction as StoreDatabaseIDAction
+from ufpy.UsageArgumentParser import AppendParmNameAndLevelAction as AppendParmNameAndLevelAction
+
+
+RETRY_ATTEMPTS = 3
+
+logging.basicConfig(format="%(asctime)s %(name)s %(levelname)s: %(message)s",
+ datefmt="%H:%M:%S",
+ level=logging.INFO)
+log = logging.getLogger('ifpnetCDF')
+
-def validateArgs():
- parser = UsageOptionParser(conflict_handler="resolve")
- parser.add_option("-h", action="store", type="string", dest="host",
- help="Host name upon which the ifpServer is running.",
- metavar="hostname")
- parser.add_option("-r", action="store", type="int", dest="port",
- help="Port upon which the ifpServer is running.",
- metavar="port")
- parser.add_option("-u", action="store", type="string", dest="userID",
- help="The user ID to connect with",
- metavar="userID")
- parser.add_option("-o", action="store", type="string", dest="outputFile",
- help="Specifies the name of the output file.",
- metavar="outputFile")
- parser.add_option("-d", action="store", type="string", dest="databaseID",
- help="id for output database in ifpServer",
- metavar="databaseID")
- parser.add_option("-p", action="append", type="string", dest="parmList",
- help="Optional. If none specified, get all parms for the database listed. There may be several parm names specified.",
- metavar="parmName")
- parser.add_option("-s", action="store", type="string", dest="startTime",
- help="Optional. If no start time specified, make start time = 0. format: YYYYMMDD_HHMM (e.g. 19980604_1200)",
- metavar="startTime")
- parser.add_option("-e", action="store", type="string", dest="endTime",
- help="Optional. If no end time specified, make end time = Abstime::MaxFutureTime(). format: (19980604_1200)",
- metavar="endTime")
- parser.add_option("-m", action="store", type="string", dest="mask",
- help="Optional. Specifies the edit area to be used as the clip mask. If no mask was specified then the entire domain will be used. All values outside the mask will be assigned a missing value.",
- metavar="mask")
- parser.add_option("-t", action="store_true", dest="trim",
- help="Optional. If present, trim data resolution.")
- parser.add_option("-g", action="store_true", dest="geoInfo",
- help="Optional. If present, topography, latitude and longitude grids will be stored.")
- parser.add_option("-c", action="store_true", dest="compressFile",
- help="Optional. If present, the netCDF file will be compressed by the gzip.")
- parser.add_option("-f", action="store", type="int", dest="compressFileFactor",
- help="Optional. When provided in conjunction with the -c switch, provides the compression factor of gzip (1-9). Default is 6.",
- metavar="factor")
- parser.add_option("-k", action="store_true", dest="krunch",
- help="Optional. If present, the netCDF file is really shrunk, by using bytes and shorts to represent floats. Requires the -t switch.")
- parser.add_option("-C", action="store", type="string", dest="configFileName",
- help="Optional. If present, controls the interval/spacing of the grids. Identifies a configuration file defining the timing constraints. The filename identifies a file within the ifpServer TEXT/Utility directory and must be a Python file.",
- metavar="configIntervalFilename")
- parser.add_option("-v", action="store_true", dest="logFile",
- help="Optional. If present, the output from the script will be logged to the specified file. If not present, logging will default to ifpnetCDF.log located in GFESUITE_LOGDIR")
+def get_and_check_args():
+ parser = UsageArgumentParser.UsageArgumentParser(prog='ifpnetCDF', conflict_handler="resolve")
+ parser.add_argument("-h", action="store", dest="host",
+ help="Host name upon which the ifpServer is running.",
+ metavar="hostname")
+ parser.add_argument("-r", action="store", type=int, dest="port",
+ help="Port upon which the ifpServer is running.",
+ metavar="port")
+ parser.add_argument("-u", action="store", dest="userID",
+ help="The user ID to connect with",
+ default="SITE", metavar="userID")
+ parser.add_argument("-o", action="store", dest="outputFilename",
+ help="Specifies the name of the output file.",
+ default="ifpnetCDFFile.cdf", metavar="outputFile")
+ parser.add_argument("-d", action=StoreDatabaseIDAction, dest="databaseID",
+ required= True,
+ help="id for output database in ifpServer",
+ metavar="databaseID")
+ parser.add_argument("-p", action=AppendParmNameAndLevelAction, dest="parmList",
+ help="Optional. If none specified, get all parms for the database listed. There may be several parm names specified.",
+ default=[], metavar="parmName")
+ parser.add_argument("-s", action="store", dest="startTime",
+ help="Optional. If no start time specified, make start time = 0. format: YYYYMMDD_HHMM (e.g. 19980604_1200)",
+ default="19700101_0000", metavar="startTime")
+ parser.add_argument("-e", action="store", dest="endTime",
+ help="Optional. If no end time specified, make end time = Abstime::MaxFutureTime(). format: (19980604_1200)",
+ default="20371231_2359", metavar="endTime")
+ parser.add_argument("-m", action="store", dest="mask",
+ help="Optional. Specifies the edit area to be used as the clip mask. If no mask was specified then the entire domain will be used. All values outside the mask will be assigned a missing value.",
+ metavar="mask", default="")
+ parser.add_argument("-t", action="store_true", dest="trim",
+ help="Optional. If present, trim data resolution.")
+ parser.add_argument("-g", action="store_true", dest="geoInfo",
+ help="Optional. If present, topography, latitude and longitude grids will be stored.")
+ parser.add_argument("-c", action="store_true", dest="compressFile",
+ help="Optional. If present, the netCDF file will be compressed by the gzip.")
+ parser.add_argument("-f", action="store", type=int, dest="compressFileFactor",
+ help="Optional. When provided in conjunction with the -c switch, provides the compression factor of gzip (1-9). Default is 6.",
+ metavar="factor", default=6)
+ parser.add_argument("-k", action="store_true", dest="krunch",
+ help="Optional. If present, the netCDF file is really shrunk, by using bytes and shorts to represent floats. Requires the -t switch.")
+ parser.add_argument("-C", action="store", dest="configFileName",
+ help="Optional. If present, controls the interval/spacing of the grids. Identifies a configuration file defining the timing constraints. The filename identifies a file within the ifpServer TEXT/Utility directory and must be a Python file.",
+ metavar="configIntervalFilename")
+ parser.add_argument("-v", action="store", dest="logFileName",
+ help="Optional. If present, the output from the script will be logged to the specified file. If not present, logging will default to ifpnetCDF.log located in GFESUITE_LOGDIR")
- (options, args) = parser.parse_args()
+ options = parser.parse_args()
if options.host == None:
if "CDSHOST" in os.environ:
@@ -124,22 +117,48 @@ def validateArgs():
else:
parser.error("You must specify an EDEX server port number.")
- if (options.databaseID is None):
- parser.error("You must specify a database id.")
-
- return (options, args)
+ # must have trim, if krunch specified
+ if options.krunch and not options.trim:
+ setattr(options, "krunch", False)
+ return options
-def createRequest():
- obj = CreateNetCDFGridRequest()
-
- wsId = WsId(progName = "ifpnetCDF")
-
- obj.setWorkstationID(wsId)
- obj.setSiteID("")
- obj.setArgString(" ".join(sys.argv[1:]))
+def create_request(host, port, outputFilename, parmList, databaseID, startTime,
+ endTime, mask, geoInfo, compressFile, configFileName,
+ compressFileFactor, trim, krunch, userID, logFileName):
+ obj = ExecuteIfpNetCDFGridRequest(outputFilename, parmList, databaseID,
+ startTime, endTime, mask, geoInfo, compressFile, configFileName,
+ compressFileFactor, trim, krunch, userID, logFileName)
return obj
+
+def main():
+ log.info("Starting ifpnetCDF")
+ options = get_and_check_args()
+ log.debug("Command-line args: " + repr(options))
+
+ netCdfRequest = create_request(**vars(options))
+ log.debug("Sending request: " + str(netCdfRequest))
+
+ for i in range(1, RETRY_ATTEMPTS+1):
+ log.info("Attempt number: %d", i)
+
+ try:
+ thriftClient = ThriftClient.ThriftClient(options.host, options.port, "/services")
+ serverResponse = thriftClient.sendRequest(netCdfRequest)
+ except:
+ log.exception("Unhandled exception thrown during ifpnetCDF processing:")
+ sys.exit(1)
+
+ if serverResponse:
+ break
+ else:
+ log.error("Errors occurred during ifpnetCDF processing: " + serverResponse.message())
+ if (i == RETRY_ATTEMPTS):
+ log.error("Final attempt failed - exiting")
+ sys.exit(1)
+
+
if __name__ == '__main__':
main()
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/iscmosaic/iscMosaic.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/iscmosaic/iscMosaic.py
index 8095e722e8..0f2a4782e4 100755
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/iscmosaic/iscMosaic.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/iscmosaic/iscMosaic.py
@@ -18,13 +18,18 @@
# further licensing information.
##
+import logging
+import os
+import sys
+
+from ufpy import ThriftClient
+from ufpy import UsageArgumentParser
+from ufpy.UsageArgumentParser import StoreDatabaseIDAction as StoreDatabaseIDAction
+from ufpy.UsageArgumentParser import AppendParmNameAndLevelAction as AppendParmNameAndLevelAction
+
from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import ExecuteIscMosaicRequest
from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
-from dynamicserialize import DynamicSerializationManager
-import sys
-import os
-from ufpy.UsageOptionParser import UsageOptionParser
-from ufpy import ThriftClient
+
#
# Provides a command-line utility to send ISC grids to GFE.
@@ -35,88 +40,86 @@ from ufpy import ThriftClient
# Date Ticket# Engineer Description
# ------------ ---------- ----------- --------------------------
# 09/20/10 dgilling Initial Creation.
+# 03/12/13 1759 dgilling Re-factor to use a more robust
+# request object.
#
#
#
-def main():
- (options, args) = validateArgs()
-
- try:
- iscRequest = createRequest()
- thriftClient = ThriftClient.ThriftClient(options.host, options.port, "/services")
- serverResponse = thriftClient.sendRequest(iscRequest)
- except Exception, e:
- print "Unhandled exception thrown during iscMosaic processing: \n", str(e)
- sys.exit(1)
-
- if (not serverResponse.isOkay()):
- print "Errors occurred during iscMosaic processing: ", serverResponse.message()
- sys.exit(1)
-def validateArgs():
+
+logging.basicConfig(format="%(asctime)s %(name)s %(levelname)s: %(message)s",
+ datefmt="%H:%M:%S",
+ level=logging.INFO)
+log = logging.getLogger('iscMosaic')
+
+
+def get_args():
usage = """
-%prog -h hostname -r port -d outputDatabaseID [-p parm] -f inputFile
+%(prog)s -h hostname -r port -d outputDatabaseID [-p parm] -f inputFile
[-b] [-s startTime] [-e endTime] [-i parm] [-x] [-z] [-n]
[-a altMask] [-w messagePrefix] [-D gridDelay] [-o] """
- parser = UsageOptionParser(usage=usage, conflict_handler="resolve")
- parser.add_option("-h", action="store", type="string", dest="host",
+ parser = UsageArgumentParser.UsageArgumentParser(prog='iscMosaic',
+ usage=usage, conflict_handler="resolve")
+ parser.add_argument("-h", action="store", dest="host",
help="name of the ifpServer host",
- metavar="hostname")
- parser.add_option("-r", action="store", type="int", dest="port",
+ metavar="hostname", required=True)
+ parser.add_argument("-r", action="store", type=int, dest="port",
help="port number of the ifpServer",
- metavar="port")
- parser.add_option("-u", action="store", type="string", dest="user",
+ metavar="port", required=True)
+ parser.add_argument("-u", action="store", dest="userID",
help="The user ID to connect with",
- metavar="userID")
- parser.add_option("-d", action="store", type="string", dest="outputDatabaseID",
+ metavar="userID", default="SITE")
+ parser.add_argument("-d", action=StoreDatabaseIDAction, dest="databaseID",
help="id for output database in ifpServer",
metavar="outputDatabaseID")
- parser.add_option("-p", action="append", type="string", dest="processParm",
+ parser.add_argument("-p", action=AppendParmNameAndLevelAction,
+ dest="parmsToProcess", default=[],
help="name of parm to output, can have multiple switches",
metavar="parm")
- parser.add_option("-f", action="append", type="string", dest="inputFiles",
+ parser.add_argument("-f", action="append", dest="inFiles",
help="name of incoming netCDF files, can have multiple",
- metavar="inputFile")
- parser.add_option("-b", action="store_true", dest="blankOtherPeriods",
+ metavar="inputFile", default=[])
+ parser.add_argument("-b", action="store_true", dest="blankOtherPeriods",
help="blank data that does not overlap incoming grids")
- parser.add_option("-s", action="store", type="string", dest="startTime",
+ parser.add_argument("-s", action="store", dest="startTime",
help="only output grids that occur after this YYYYMMDD_HHMM",
metavar="startTime")
- parser.add_option("-e", action="store", type="string", dest="endTime",
+ parser.add_argument("-e", action="store", dest="endTime",
help="only output grids that occur before this YYYYMMDD_HHMM",
metavar="endTime")
- parser.add_option("-x", action="store_true", dest="replaceOnly",
+ parser.add_argument("-x", action="store_true", dest="replaceOnly",
help="replace grids with input grids, do not perform merge")
- parser.add_option("-z", action="store_true", dest="eraseFirst",
+ parser.add_argument("-z", action="store_true", dest="eraseFirst",
help="erase all grids in destination parm before storing")
- parser.add_option("-n", action="store_true", dest="ignoreMask",
+ parser.add_argument("-n", action="store_true", dest="ignoreMask",
help="do not mask the grids upon storage (ignore incoming siteID)")
- parser.add_option("-a", action="store", type="string", dest="altMask",
+ parser.add_argument("-a", action="store", dest="altMask",
help="use an alternative mask, rather than the siteID",
metavar="altMask")
- parser.add_option("-w", action="store", type="string", dest="message",
+ parser.add_argument("-w", action="store", dest="announce",
help="alert users of data storage",
- metavar="message")
- parser.add_option("-k", action="store_true", dest="deleteInput",
+ metavar="message", default="")
+ parser.add_argument("-k", action="store_true", dest="deleteInput",
help="Delete the input file after processing.")
- parser.add_option("-i", action="append", type="string", dest="ignoreParm",
+ parser.add_argument("-i", action=AppendParmNameAndLevelAction,
+ dest="parmsToIgnore", default=[],
help="Do not process parm by this name.",
metavar="parm")
- parser.add_option("-D", action="store", type="float", dest="gridDelay",
+ parser.add_argument("-D", action="store", type=float, dest="gridDelay",
help="Delay between grids during processing (Default 0.00)",
- metavar="gridDelay")
- parser.add_option("-o", action="store_true", dest="renameWE",
+ metavar="gridDelay", default=0.0)
+ parser.add_argument("-o", action="store_true", dest="renameWE",
help="Use office type information to rename incoming data.")
- parser.add_option("-S", action="store_true", dest="iscSends",
+ parser.add_argument("-S", action="store_true", dest="iscSends",
help="If storing in Fcst database, also force ISC send queueing.")
- parser.add_option("-T", action="store_true", dest="adjustTranslate",
+ parser.add_argument("-T", action="store_true", dest="adjustTranslate",
help="Translate WEATHER and DISCRETE data into compatible values known by destination ifpServer.")
- parser.add_option("-v", action="store_true", dest="logFile",
+ parser.add_argument("-v", action="store", dest="logFileName",
help="Log file destination.")
- (options, args) = parser.parse_args()
+ options = parser.parse_args()
if options.host == None:
if "CDSHOST" in os.environ:
@@ -129,29 +132,48 @@ def validateArgs():
options.port = int(os.environ["CDSPORT"])
else:
parser.error("No server port defined.")
-
- if (options.inputFiles is None):
- parser.error("-f: At least one input file must be provided.")
- if (len(options.inputFiles) > 1 and options.eraseFirst):
+ if len(options.inFiles) > 1 and options.eraseFirst:
parser.error("Multiple input files [-f switches] and -z switch not compatible.")
- if (options.ignoreMask and options.altMask is not None):
+ if options.ignoreMask and options.altMask is not None:
parser.error("-n and -a altMask switches are not compatible")
- return (options, args)
+ return options
-def createRequest():
- obj = ExecuteIscMosaicRequest()
-
- wsId = WsId(progName="iscMosaic")
-
- obj.setWorkstationID(wsId)
- obj.setSiteID("")
- obj.setArgString(" ".join(sys.argv[1:]))
+def create_request(host, port, userID, databaseID, parmsToProcess, blankOtherPeriods,
+ startTime, endTime, altMask, replaceOnly, eraseFirst,
+ announce, renameWE, iscSends, inFiles, ignoreMask,
+ adjustTranslate, deleteInput, parmsToIgnore, gridDelay,
+ logFileName):
+ obj = ExecuteIscMosaicRequest(userID, databaseID, parmsToProcess,
+ blankOtherPeriods, startTime, endTime, altMask, replaceOnly,
+ eraseFirst, announce, renameWE, iscSends, inFiles, ignoreMask,
+ adjustTranslate, deleteInput, parmsToIgnore, gridDelay, logFileName)
return obj
+
+def main():
+ log.info("Starting iscMosaic")
+ options = get_args()
+ log.debug("Command-line args: " + repr(options))
+
+ iscRequest = create_request(**vars(options))
+ log.debug("Sending request: " + str(iscRequest))
+
+ try:
+ thriftClient = ThriftClient.ThriftClient(options.host, options.port, "/services")
+ serverResponse = thriftClient.sendRequest(iscRequest)
+ except:
+ log.exception("Unhandled exception thrown during iscMosaic processing:")
+ sys.exit(1)
+
+ if not serverResponse:
+ log.error("Errors occurred during iscMosaic processing: " + str(serverResponse.message()))
+ sys.exit(1)
+
+
if __name__ == '__main__':
main()
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/purgeallgrids/purgeAllGrids.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/purgeallgrids/purgeAllGrids.py
index 081966ed00..8697c6fbae 100755
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/purgeallgrids/purgeAllGrids.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/purgeallgrids/purgeAllGrids.py
@@ -47,7 +47,7 @@ from ufpy.UsageArgumentParser import StoreDatabaseIDAction as StoreDatabaseIDAct
logging.basicConfig(format="%(asctime)s %(name)s %(levelname)s: %(message)s",
datefmt="%H:%M:%S",
- level=logging.DEBUG)
+ level=logging.INFO)
log = logging.getLogger('purgeAllGrids')
diff --git a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
index c78bd0129b..69fe7e3bf4 100644
--- a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
+++ b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
@@ -27,3 +27,4 @@ __all__ = [
'message'
]
+
diff --git a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/db/objects/ParmID.py b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/db/objects/ParmID.py
index 2ac291d476..e479aad083 100644
--- a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/db/objects/ParmID.py
+++ b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/db/objects/ParmID.py
@@ -107,16 +107,11 @@ class ParmID(object):
@staticmethod
def parmNameAndLevel(composite):
- retValue = []
-
pos = composite.find('_')
if pos != -1:
- retValue.append(composite[:pos])
- retValue.append(composite[pos+1:])
+ return (composite[:pos], composite[pos+1:])
else:
- retValue.append(composite)
- retValue.append("SFC")
- return retValue
+ return (composite, "SFC")
def __str__(self):
return self.__repr__()
diff --git a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/CreateNetCDFGridRequest.py b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/CreateNetCDFGridRequest.py
deleted file mode 100644
index 14e92ab0d7..0000000000
--- a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/CreateNetCDFGridRequest.py
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-# This software was developed and / or modified by Raytheon Company,
-# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
-#
-# U.S. EXPORT CONTROLLED TECHNICAL DATA
-# This software product contains export-restricted data whose
-# export/transfer/disclosure is restricted by U.S. law. Dissemination
-# to non-U.S. persons whether in the United States or abroad requires
-# an export license or other authorization.
-#
-# Contractor Name: Raytheon Company
-# Contractor Address: 6825 Pine Street, Suite 340
-# Mail Stop B8
-# Omaha, NE 68106
-# 402.291.0100
-#
-# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
-# further licensing information.
-##
-
-# File auto-generated against equivalent DynamicSerialize Java class
-
-class CreateNetCDFGridRequest(object):
-
- def __init__(self):
- self.argString = None
- self.workstationID = None
- self.siteID = None
-
- def getArgString(self):
- return self.argString
-
- def setArgString(self, argString):
- self.argString = argString
-
- def getWorkstationID(self):
- return self.workstationID
-
- def setWorkstationID(self, workstationID):
- self.workstationID = workstationID
-
- def getSiteID(self):
- return self.siteID
-
- def setSiteID(self, siteID):
- self.siteID = siteID
-
diff --git a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ExecuteIfpNetCDFGridRequest.py b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ExecuteIfpNetCDFGridRequest.py
new file mode 100644
index 0000000000..3d65f4bc40
--- /dev/null
+++ b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ExecuteIfpNetCDFGridRequest.py
@@ -0,0 +1,187 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+#
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+#
+# Contractor Name: Raytheon Company
+# Contractor Address: 6825 Pine Street, Suite 340
+# Mail Stop B8
+# Omaha, NE 68106
+# 402.291.0100
+#
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+# File auto-generated against equivalent DynamicSerialize Java class
+# and then modified post-generation to use AbstractGfeRequest and
+# implement str(), repr()
+#
+# SOFTWARE HISTORY
+#
+# Date Ticket# Engineer Description
+# ------------ ---------- ----------- --------------------------
+# xx/xx/?? dgilling Initial Creation.
+# 03/13/13 1759 dgilling Add software history header.
+#
+#
+#
+
+from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import AbstractGfeRequest
+from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
+
+class ExecuteIfpNetCDFGridRequest(AbstractGfeRequest):
+
+ def __init__(self, outputFilename=None, parmList=[], databaseID=None,
+ startTime=None, endTime=None, mask=None, geoInfo=False,
+ compressFile=False, configFileName=None, compressFileFactor=0,
+ trim=False, krunch=False, userID=None, logFileName=None):
+ super(ExecuteIfpNetCDFGridRequest, self).__init__()
+ self.outputFilename = outputFilename
+ self.parmList = parmList
+ self.databaseID = databaseID
+ self.startTime = startTime
+ self.endTime = endTime
+ self.mask = mask
+ self.geoInfo = geoInfo
+ self.compressFile = compressFile
+ self.configFileName = configFileName
+ self.compressFileFactor = compressFileFactor
+ self.trim = trim
+ self.krunch = krunch
+ self.userID = userID
+ self.logFileName = logFileName
+ if self.userID is not None:
+ self.workstationID = WsId(progName='ifpnetCDF', userName=self.userID)
+ if self.databaseID is not None:
+ self.siteID = self.databaseID.getSiteId()
+
+ def __str__(self):
+ retVal = "ExecuteIfpNetCDFGridRequest["
+ retVal += "wokstationID: " + str(self.workstationID) + ", "
+ retVal += "siteID: " + str(self.siteID) + ", "
+ retVal += "outputFilename: " + str(self.outputFilename) + ", "
+ retVal += "parmList: " + str(self.parmList) + ", "
+ retVal += "databaseID: " + str(self.databaseID) + ", "
+ retVal += "startTime: " + str(self.startTime) + ", "
+ retVal += "endTime: " + str(self.endTime) + ", "
+ retVal += "mask: " + str(self.mask) + ", "
+ retVal += "geoInfo: " + str(self.geoInfo) + ", "
+ retVal += "compressFile: " + str(self.compressFile) + ", "
+ retVal += "configFileName: " + str(self.configFileName) + ", "
+ retVal += "compressFileFactor: " + str(self.compressFileFactor) + ", "
+ retVal += "trim: " + str(self.trim) + ", "
+ retVal += "krunch: " + str(self.krunch) + ", "
+ retVal += "userID: " + str(self.userID) + ", "
+ retVal += "logFileName: " + str(self.logFileName) + "]"
+ return retVal
+
+ def __repr__(self):
+ retVal = "ExecuteIfpNetCDFGridRequest("
+ retVal += "wokstationID=" + repr(self.workstationID) + ", "
+ retVal += "siteID=" + repr(self.siteID) + ", "
+ retVal += "outputFilename=" + repr(self.outputFilename) + ", "
+ retVal += "parmList=" + repr(self.parmList) + ", "
+ retVal += "databaseID=" + repr(self.databaseID) + ", "
+ retVal += "startTime=" + repr(self.startTime) + ", "
+ retVal += "endTime=" + repr(self.endTime) + ", "
+ retVal += "mask=" + repr(self.mask) + ", "
+ retVal += "geoInfo=" + repr(self.geoInfo) + ", "
+ retVal += "compressFile=" + repr(self.compressFile) + ", "
+ retVal += "configFileName=" + repr(self.configFileName) + ", "
+ retVal += "compressFileFactor=" + repr(self.compressFileFactor) + ", "
+ retVal += "trim=" + repr(self.trim) + ", "
+ retVal += "krunch=" + repr(self.krunch) + ", "
+ retVal += "userID=" + repr(self.userID) + ", "
+ retVal += "logFileName=" + repr(self.logFileName) + ")"
+ return retVal
+
+ def getOutputFilename(self):
+ return self.outputFilename
+
+ def setOutputFilename(self, outputFilename):
+ self.outputFilename = outputFilename
+
+ def getParmList(self):
+ return self.parmList
+
+ def setParmList(self, parmList):
+ self.parmList = parmList
+
+ def getDatabaseID(self):
+ return self.databaseID
+
+ def setDatabaseID(self, databaseID):
+ self.databaseID = databaseID
+
+ def getStartTime(self):
+ return self.startTime
+
+ def setStartTime(self, startTime):
+ self.startTime = startTime
+
+ def getEndTime(self):
+ return self.endTime
+
+ def setEndTime(self, endTime):
+ self.endTime = endTime
+
+ def getMask(self):
+ return self.mask
+
+ def setMask(self, mask):
+ self.mask = mask
+
+ def getGeoInfo(self):
+ return self.geoInfo
+
+ def setGeoInfo(self, geoInfo):
+ self.geoInfo = geoInfo
+
+ def getCompressFile(self):
+ return self.compressFile
+
+ def setCompressFile(self, compressFile):
+ self.compressFile = compressFile
+
+ def getConfigFileName(self):
+ return self.configFileName
+
+ def setConfigFileName(self, configFileName):
+ self.configFileName = configFileName
+
+ def getCompressFileFactor(self):
+ return self.compressFileFactor
+
+ def setCompressFileFactor(self, compressFileFactor):
+ self.compressFileFactor = compressFileFactor
+
+ def getTrim(self):
+ return self.trim
+
+ def setTrim(self, trim):
+ self.trim = trim
+
+ def getKrunch(self):
+ return self.krunch
+
+ def setKrunch(self, krunch):
+ self.krunch = krunch
+
+ def getUserID(self):
+ return self.userID
+
+ def setUserID(self, userID):
+ self.userID = userID
+
+ def getLogFileName(self):
+ return self.logFileName
+
+ def setLogFileName(self, logFileName):
+ self.logFileName = logFileName
+
diff --git a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ExecuteIscMosaicRequest.py b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ExecuteIscMosaicRequest.py
index a3fb676c55..f4ef0ff246 100644
--- a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ExecuteIscMosaicRequest.py
+++ b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ExecuteIscMosaicRequest.py
@@ -19,29 +19,216 @@
##
# File auto-generated against equivalent DynamicSerialize Java class
+# and then modified post-generation to use AbstractGfeRequest and
+# implement str(), repr()
+#
+# SOFTWARE HISTORY
+#
+# Date Ticket# Engineer Description
+# ------------ ---------- ----------- --------------------------
+# xx/xx/?? dgilling Initial Creation.
+# 03/13/13 1759 dgilling Add software history header.
+#
+#
+#
-class ExecuteIscMosaicRequest(object):
- def __init__(self):
- self.argString = None
- self.workstationID = None
- self.siteID = None
+from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import AbstractGfeRequest
+from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
- def getArgString(self):
- return self.argString
+class ExecuteIscMosaicRequest(AbstractGfeRequest):
- def setArgString(self, argString):
- self.argString = argString
+ def __init__(self, userID=None, databaseID=None, parmsToProcess=[],
+ blankOtherPeriods=False, startTime=None, endTime=None,
+ altMask=None, replaceOnly=False, eraseFirst=False, announce="",
+ renameWE=False, iscSends=False, inFiles=[], ignoreMask=False,
+ adjustTranslate=False, deleteInput=False, parmsToIgnore=[],
+ gridDelay=0.0, logFileName=None):
+ super(ExecuteIscMosaicRequest, self).__init__()
+ self.userID = userID
+ self.databaseID = databaseID
+ self.parmsToProcess = parmsToProcess
+ self.blankOtherPeriods = blankOtherPeriods
+ self.startTime = startTime
+ self.endTime = endTime
+ self.altMask = altMask
+ self.replaceOnly = replaceOnly
+ self.eraseFirst = eraseFirst
+ self.announce = announce
+ self.renameWE = renameWE
+ self.iscSends = iscSends
+ self.inFiles = inFiles
+ self.ignoreMask = ignoreMask
+ self.adjustTranslate = adjustTranslate
+ self.deleteInput = deleteInput
+ self.parmsToIgnore = parmsToIgnore
+ self.gridDelay = gridDelay
+ self.logFileName = logFileName
+ if self.userID is not None:
+ self.workstationID = WsId(progName='iscMosaic', userName=self.userID)
+ if self.databaseID is not None:
+ self.siteID = self.databaseID.getSiteId()
+
+ def __str__(self):
+ retVal = "ExecuteIscMosaicRequest["
+ retVal += "wokstationID: " + str(self.workstationID) + ", "
+ retVal += "siteID: " + str(self.siteID) + ", "
+ retVal += "userID: " + str(self.userID) + ", "
+ retVal += "databaseID: " + str(self.databaseID) + ", "
+ retVal += "parmsToProcess: " + str(self.parmsToProcess) + ", "
+ retVal += "blankOtherPeriods: " + str(self.blankOtherPeriods) + ", "
+ retVal += "startTime: " + str(self.startTime) + ", "
+ retVal += "endTime: " + str(self.endTime) + ", "
+ retVal += "altMask: " + str(self.altMask) + ", "
+ retVal += "replaceOnly: " + str(self.replaceOnly) + ", "
+ retVal += "eraseFirst: " + str(self.eraseFirst) + ", "
+ retVal += "announce: " + str(self.announce) + ", "
+ retVal += "renameWE: " + str(self.renameWE) + ", "
+ retVal += "iscSends: " + str(self.iscSends) + ", "
+ retVal += "inFiles: " + str(self.inFiles) + ", "
+ retVal += "ignoreMask: " + str(self.ignoreMask) + ", "
+ retVal += "adjustTranslate: " + str(self.adjustTranslate) + ", "
+ retVal += "deleteInput: " + str(self.deleteInput) + ", "
+ retVal += "parmsToIgnore: " + str(self.parmsToIgnore) + ", "
+ retVal += "gridDelay: " + str(self.gridDelay) + ", "
+ retVal += "logFileName: " + str(self.logFileName) + "]"
+ return retVal
+
+ def __repr__(self):
+ retVal = "ExecuteIscMosaicRequest("
+ retVal += "wokstationID= " + str(self.workstationID) + ", "
+ retVal += "siteID= " + str(self.siteID) + ", "
+ retVal += "userID= " + str(self.userID) + ", "
+ retVal += "databaseID= " + str(self.databaseID) + ", "
+ retVal += "parmsToProcess= " + str(self.parmsToProcess) + ", "
+ retVal += "blankOtherPeriods= " + str(self.blankOtherPeriods) + ", "
+ retVal += "startTime= " + str(self.startTime) + ", "
+ retVal += "endTime= " + str(self.endTime) + ", "
+ retVal += "altMask= " + str(self.altMask) + ", "
+ retVal += "replaceOnly= " + str(self.replaceOnly) + ", "
+ retVal += "eraseFirst= " + str(self.eraseFirst) + ", "
+ retVal += "announce= " + str(self.announce) + ", "
+ retVal += "renameWE= " + str(self.renameWE) + ", "
+ retVal += "iscSends= " + str(self.iscSends) + ", "
+ retVal += "inFiles= " + str(self.inFiles) + ", "
+ retVal += "ignoreMask= " + str(self.ignoreMask) + ", "
+ retVal += "adjustTranslate= " + str(self.adjustTranslate) + ", "
+ retVal += "deleteInput= " + str(self.deleteInput) + ", "
+ retVal += "parmsToIgnore= " + str(self.parmsToIgnore) + ", "
+ retVal += "gridDelay= " + str(self.gridDelay) + ", "
+ retVal += "logFileName= " + str(self.logFileName) + ")"
+ return retVal
- def getWorkstationID(self):
- return self.workstationID
+ def getUserID(self):
+ return self.userID
- def setWorkstationID(self, workstationID):
- self.workstationID = workstationID
+ def setUserID(self, userID):
+ self.userID = userID
- def getSiteID(self):
- return self.siteID
+ def getDatabaseID(self):
+ return self.databaseID
- def setSiteID(self, siteID):
- self.siteID = siteID
+ def setDatabaseID(self, databaseID):
+ self.databaseID = databaseID
+ def getParmsToProcess(self):
+ return self.parmsToProcess
+
+ def setParmsToProcess(self, parmsToProcess):
+ self.parmsToProcess = parmsToProcess
+
+ def getBlankOtherPeriods(self):
+ return self.blankOtherPeriods
+
+ def setBlankOtherPeriods(self, blankOtherPeriods):
+ self.blankOtherPeriods = blankOtherPeriods
+
+ def getStartTime(self):
+ return self.startTime
+
+ def setStartTime(self, startTime):
+ self.startTime = startTime
+
+ def getEndTime(self):
+ return self.endTime
+
+ def setEndTime(self, endTime):
+ self.endTime = endTime
+
+ def getAltMask(self):
+ return self.altMask
+
+ def setAltMask(self, altMask):
+ self.altMask = altMask
+
+ def getReplaceOnly(self):
+ return self.replaceOnly
+
+ def setReplaceOnly(self, replaceOnly):
+ self.replaceOnly = replaceOnly
+
+ def getEraseFirst(self):
+ return self.eraseFirst
+
+ def setEraseFirst(self, eraseFirst):
+ self.eraseFirst = eraseFirst
+
+ def getAnnounce(self):
+ return self.announce
+
+ def setAnnounce(self, announce):
+ self.announce = announce
+
+ def getRenameWE(self):
+ return self.renameWE
+
+ def setRenameWE(self, renameWE):
+ self.renameWE = renameWE
+
+ def getIscSends(self):
+ return self.iscSends
+
+ def setIscSends(self, iscSends):
+ self.iscSends = iscSends
+
+ def getInFiles(self):
+ return self.inFiles
+
+ def setInFiles(self, inFiles):
+ self.inFiles = inFiles
+
+ def getIgnoreMask(self):
+ return self.ignoreMask
+
+ def setIgnoreMask(self, ignoreMask):
+ self.ignoreMask = ignoreMask
+
+ def getAdjustTranslate(self):
+ return self.adjustTranslate
+
+ def setAdjustTranslate(self, adjustTranslate):
+ self.adjustTranslate = adjustTranslate
+
+ def getDeleteInput(self):
+ return self.deleteInput
+
+ def setDeleteInput(self, deleteInput):
+ self.deleteInput = deleteInput
+
+ def getParmsToIgnore(self):
+ return self.parmsToIgnore
+
+ def setParmsToIgnore(self, parmsToIgnore):
+ self.parmsToIgnore = parmsToIgnore
+
+ def getGridDelay(self):
+ return self.gridDelay
+
+ def setGridDelay(self, gridDelay):
+ self.gridDelay = gridDelay
+
+ def getLogFileName(self):
+ return self.logFileName
+
+ def setLogFileName(self, logFileName):
+ self.logFileName = logFileName
diff --git a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/__init__.py b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/__init__.py
index 254921cff2..6efb901e5b 100644
--- a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/__init__.py
+++ b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/__init__.py
@@ -25,7 +25,7 @@ __all__ = [
'ClearPracticeVTECTableRequest',
'CommitGridsRequest',
'ConfigureTextProductsRequest',
- 'CreateNetCDFGridRequest',
+ 'ExecuteIfpNetCDFGridRequest',
'ExecuteIscMosaicRequest',
'GetASCIIGridsRequest',
'GetGridDataRequest',
@@ -49,11 +49,11 @@ __all__ = [
'SmartInitRequest'
]
-from CommitGridsRequest import CommitGridsRequest
from AbstractGfeRequest import AbstractGfeRequest
from ClearPracticeVTECTableRequest import ClearPracticeVTECTableRequest
+from CommitGridsRequest import CommitGridsRequest
from ConfigureTextProductsRequest import ConfigureTextProductsRequest
-from CreateNetCDFGridRequest import CreateNetCDFGridRequest
+from ExecuteIfpNetCDFGridRequest import ExecuteIfpNetCDFGridRequest
from ExecuteIscMosaicRequest import ExecuteIscMosaicRequest
from GetASCIIGridsRequest import GetASCIIGridsRequest
from GetGridDataRequest import GetGridDataRequest
diff --git a/pythonPackages/ufpy/UsageArgumentParser.py b/pythonPackages/ufpy/UsageArgumentParser.py
index fc503e3c20..3d51564a3f 100644
--- a/pythonPackages/ufpy/UsageArgumentParser.py
+++ b/pythonPackages/ufpy/UsageArgumentParser.py
@@ -22,6 +22,7 @@ import argparse
import sys
from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.db.objects import DatabaseID
+from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.db.objects import ParmID
class UsageArgumentParser(argparse.ArgumentParser):
@@ -43,4 +44,15 @@ class StoreDatabaseIDAction(argparse.Action):
else:
parser.error("DatabaseID [" + values + "] not a valid identifier")
+class AppendParmNameAndLevelAction(argparse.Action):
+ def __call__(self, parser, namespace, values, option_string=None):
+ tx = ParmID.parmNameAndLevel(values)
+ comp = tx[0] + '_' + tx[1]
+ if (hasattr(namespace, self.dest)) and \
+ (getattr(namespace, self.dest) is not None):
+ currentValues = getattr(namespace, self.dest)
+ currentValues.append(comp)
+ setattr(namespace, self.dest, currentValues)
+ else:
+ setattr(namespace, self.dest, [comp])