From ebd65eb24f25ecbf346c0c7124cf3c93ae0bc6b9 Mon Sep 17 00:00:00 2001 From: Richard Peter Date: Wed, 4 Sep 2013 15:47:35 -0500 Subject: [PATCH] Issue #2298: Remove setPluginName python calls. Former-commit-id: 7d1cf6881e98360598b6da0b81d3da449f9f0c0c [formerly 6b93f9ad06cd66000e1f4900f11d0ad4ee9da62d] [formerly 799fe37bca41420a0902010e879c553c77633c6b [formerly b666f99d3dc79b90525177072e2448077c39545a]] Former-commit-id: 799fe37bca41420a0902010e879c553c77633c6b Former-commit-id: 8c9e5f214bb3f317aca89471b09034d34b519f85 --- edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py | 5 +---- ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/NcgribDecoder.py | 4 +--- .../uf/common/dataplugin/gfe/db/objects/GFERecord.py | 5 +---- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py b/edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py index 4b8f61f5f2..d5a0190ae4 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py +++ b/edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py @@ -70,8 +70,6 @@ from com.raytheon.uf.common.parameter import Parameter; from com.raytheon.uf.common.parameter.mapping import ParameterMapper; -PLUGIN_NAME = "grid" - # Static values for accessing parameter lookup tables PARAMETER_TABLE = "4.2" GENPROCESS_TABLE = "A" @@ -131,7 +129,7 @@ THINNED_GRID_VALUES = THINNED_GRID_PT_MAP.values() # 04/7/09 #1994 bphillip Initial Creation. # Mar 25, 2013 1821 bsteffen Reshape grib data arrays in # place to improve performance. -# +# Sep 04, 2013 2298 rjpeter Removed setPluginName call class GribDecoder(): ## @@ -403,7 +401,6 @@ class GribDecoder(): # Construct the GribRecord record = GridRecord() - record.setPluginName(PLUGIN_NAME) record.setDataTime(dataTime) record.setMessageData(numpyDataArray) record.setLocation(gdsSectionValues['coverage']) diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/NcgribDecoder.py b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/NcgribDecoder.py index faeb0f27c3..709cc0b530 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/NcgribDecoder.py +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/NcgribDecoder.py @@ -68,8 +68,6 @@ from gov.noaa.nws.ncep.edex.util.grib2vcrd import Grib2VcrdTableLookup from gov.noaa.nws.ncep.edex.plugin.ncgrib import Ncgrib1Decoder from gov.noaa.nws.ncep.edex.util.ncgrib import NcgribParamTranslator -PLUGIN_NAME = "ncgrib" - # Static values for accessing parameter lookup tables PARAMETER_TABLE = "4.2" GENPROCESS_TABLE = "A" @@ -137,6 +135,7 @@ THINNED_GRID_VALUES = THINNED_GRID_PT_MAP.values() # 11/02/11 xguo Added codes to decode firewx # 11/08/11 xguo Adjusted glevel1/glevel2 for PRES/PDLY/POTV # 11/22/11 xguo Updated Level infor in model +# Sep 04, 2013 2298 rjpeter Removed setPluginName call # class NcgribDecoder(): @@ -460,7 +459,6 @@ class NcgribDecoder(): # Construct the ncgribRecord record = NcgribRecord() - record.setPluginName(PLUGIN_NAME) record.setDataTime(dataTime) record.setMasterTableVersion(idSectionValues['masterTableVersion']) record.setLocalTableVersion(idSectionValues['localTableVersion']) diff --git a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.py b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.py index 4187bb40ae..8b8e150e1e 100644 --- a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.py +++ b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.py @@ -87,10 +87,7 @@ class GFERecord(object): self.dataURI = dataURI def getPluginName(self): - return self.pluginName - - def setPluginName(self, pluginName): - self.pluginName = pluginName + return "gfe" def getDataTime(self): return self.dataTime