diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java index 77d36ccd59..24b349fbe9 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java @@ -20,6 +20,7 @@ package com.raytheon.viz.gfe.core.internal; +import java.io.File; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -169,6 +170,8 @@ import com.raytheon.viz.gfe.types.MutableInteger; * Jan 04, 2018 7178 randerso Removed deallocateUnusedGrids. Code cleanup * Jan 24, 2018 7153 randerso Changes to allow new GFE config file to be * selected when perspective is re-opened. + * Feb 01, 2019 ---- mjames Use only BASE level for now/dev. + * Feb 04, 2019 ---- mjames Force sync of python files required by GFE perspective. * Feb 28, 2018 7116 randerso Force time range to be recalculated when * simulated time is changed. * Dec 11, 2018 7692 dgilling Add additional debug logging to track VCParm @@ -2898,23 +2901,47 @@ public class ParmManager private List initVirtualCalcParmDefinitions() { // retrieve the inventory from the ifpServer IPathManager pathMgr = PathManagerFactory.getPathManager(); - LocalizationContext[] contexts = new LocalizationContext[] { - pathMgr.getContext(LocalizationType.COMMON_STATIC, - LocalizationLevel.BASE), - pathMgr.getContext(LocalizationType.COMMON_STATIC, - LocalizationLevel.SITE), - pathMgr.getContext(LocalizationType.COMMON_STATIC, - LocalizationLevel.USER) }; Map modMap = new HashMap<>(); - for (LocalizationContext context : contexts) { - LocalizationFile[] files = pathMgr.listFiles(context, - FileUtil.join("gfe", "vcmodule"), new String[] { "py" }, + + LocalizationContext context = pathMgr.getContext( + LocalizationType.COMMON_STATIC, + LocalizationLevel.BASE); + + // vcmodule files + LocalizationFile[] files = pathMgr.listFiles(context, + "gfe/vcmodule", new String[] { "py" }, + false, true); + for (LocalizationFile lf : files) { + String modName = LocalizationUtil.extractName(lf.getPath()) + .replace(".py", ""); + modMap.put(modName, lf); + } + + String[] syncPaths = { + "python", + "python/time", + "python/dataaccess", + "gfe/vcmodule", + "gfe/vcmodule/utility", + "gfe/python", + "gfe/textproducts/templates/product", + "gfe/textproducts/templates", + "gfe/textproducts", + "vtec" + }; + + for (String path : syncPaths){ + LocalizationFile[] baseGfeFiles = pathMgr.listFiles(context, + path, new String[] {"py" }, false, true); - for (LocalizationFile lf : files) { - String modName = LocalizationUtil.extractName(lf.getPath()) - .replace(".py", ""); - modMap.put(modName, lf); + for (LocalizationFile lf : baseGfeFiles) { + try { + File pyFile = lf.getFile(true); + } catch (LocalizationException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } } diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml index b937a6dc4a..dbab7146a7 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml @@ -1,36 +1,8 @@ - - - - - mosGuideNDFD - gfs20km - gfs20km + gfs20km + gfs20km gfs20km - gfs20km + gfs20km ESTOFS ESTOFS ESTOFS @@ -39,6 +11,7 @@ glerl GRLKwave localMPE + mosaicMPE localHPE HRRR HWRF @@ -72,16 +45,15 @@ mrf202 gfs201 mrf201 - gfs213 + gfs95 avn211 - mesoEta212 - mesoEta215 - eta212 + NAM20 + eta212 avn203 mrf203 mrf204 mrf205 - eta207 + eta207 avnNH avnNH avnNH @@ -91,7 +63,7 @@ avnNH avnNH avnNH - gww233 + gww233 gww233 gww233 gww233 @@ -100,31 +72,25 @@ seaIce219 seaIce219 seaIce219 - ruc236 + rap40 avn225 akWave239 wnaWave238 - mesoEta216 - eta218 - eta242 + eta242 enpWave253 TPCtcm226 - TPCtcm175 - TPCtcm250 + TCPtcm175 + TPCtpm250 nic218 nic242 - dgex185 - dgex186 - gfs212 + gfs212 gfs160 gfs254 gfs161 gfs161 - ruc130 + ruc130 rtmaNDFD - urmaNDFD - urmaNDFD - urmaNDFD + NamDNG GlobalWave AKwave10 @@ -137,22 +103,22 @@ NamDNG NamDNG NamDNG - HiResW - HiResW - HiResW - HiResW - HiResW - HiResW - HiResW - HiResW - HiResW - HiResW - HiResW - HiResW + HiResW-arwEast + HiResW-arwWest + HiResW-arwAK + HiResW-arwSJU + HiResW-arwHI + HiResW-arwGU + HiResW-nmmEast + HiResW-nmmWest + HiResW-nmmAK + HiResW-nmmSJU + HiResW-nmmHI + HiResW-nmmGU GRLKwave msas gfs201 - eta218 + NAM12 ensembleNH ensembleNH ensembleNH @@ -165,7 +131,7 @@ sref212 sref216 sref243 - rtgsst235 + RTGSST235 gfsGuide232 OCONUSrtmaNDFD OCONUSrtmaNDFD @@ -174,7 +140,7 @@ rtgssthr173 qpf218 hpc_qpf218 - hpcGuideNDFD + hpcGuideNDFD HPCqpfNDFD opcWave180 @@ -188,16 +154,14 @@ tpcWind231 tpcWind231 opcWave182 - mosGuideNDFD - mosGuideNDFD_AK lampNDFD TPCSurgeProb TPCSurgeProb TPCSurgeProb TPCSurgeProb - P-ETSS + ecmwf ecmwf ecmwf @@ -216,6 +180,7 @@ ecmfNH ecmfNH laps + PHISH rtofsAtlantic rtofsAtlantic rtofsAtlantic @@ -241,9 +206,9 @@ NAHwave15 NAHwave10 NAHwave4 - ETSS + nwpsCG1 nwpsCG1 nwpsCG1 @@ -340,4 +305,4 @@ ncom ncom PWPF - + \ No newline at end of file