diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/catalog/CatalogQuery.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/catalog/CatalogQuery.java index 92fae31080..0d9280036e 100644 --- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/catalog/CatalogQuery.java +++ b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/catalog/CatalogQuery.java @@ -36,6 +36,7 @@ import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.status.UFStatus.Priority; import com.raytheon.uf.common.time.BinOffset; import com.raytheon.uf.common.time.DataTime; +import com.raytheon.uf.common.time.SimulatedTime; import com.raytheon.uf.viz.core.comm.Connector; import com.raytheon.uf.viz.core.exception.VizException; import com.raytheon.uf.viz.core.requests.ThriftClient; @@ -232,7 +233,9 @@ public class CatalogQuery { req.setMaxQuery(max); req.setPluginName(pluginName); req.setBinOffset(binOffset); + req.setSimDate(SimulatedTime.getSystemTime().getTime()); req.setQueryTerms(constraintMap); + return req; } @@ -251,6 +254,7 @@ public class CatalogQuery { * @return the available times that meet the constraints * @throws VizException */ + @SuppressWarnings("unchecked") public static DataTime[] performTimeQuery( Map constraintMap, boolean max, BinOffset binOffset) throws VizException { diff --git a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java index 17c89b5401..b8a1f6f828 100644 --- a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java +++ b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java @@ -39,6 +39,7 @@ import com.raytheon.uf.common.serialization.SerializationException; import com.raytheon.uf.common.serialization.SerializationUtil; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; +import com.raytheon.uf.common.time.SimulatedTime; import com.raytheon.uf.common.util.FileUtil; import com.raytheon.uf.viz.core.VizApp; import com.raytheon.uf.viz.monitor.ffmp.FFMPMonitor; @@ -474,7 +475,7 @@ public class FFMPDataLoader extends Thread { FFMPBasinData basinData = null; - if (file.exists()) { + if (file.exists() && SimulatedTime.getSystemTime().isRealTime()) { System.out.println("File path: " + file.getName()); diff --git a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientURICatalog.java b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientURICatalog.java index 3b412d5af4..941fea86a4 100644 --- a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientURICatalog.java +++ b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientURICatalog.java @@ -35,6 +35,7 @@ import com.raytheon.uf.common.dataquery.requests.TimeQueryRequest; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.time.DataTime; +import com.raytheon.uf.common.time.SimulatedTime; import com.raytheon.uf.viz.core.datastructure.DataCubeContainer; import com.raytheon.uf.viz.core.exception.VizException; import com.raytheon.uf.viz.core.rsc.URICatalog; @@ -122,6 +123,7 @@ public class ThinClientURICatalog extends URICatalog implements TimeQueryRequest request = new TimeQueryRequest(); request.setPluginName(pluginName); request.setMaxQuery(true); + request.setSimDate(SimulatedTime.getSystemTime().getTime()); request.setQueryTerms(map); List requestList = requests.get(pluginName); if (requestList == null) { @@ -182,6 +184,7 @@ public class ThinClientURICatalog extends URICatalog implements } } } + rebuildTree(); } @Override @@ -192,11 +195,13 @@ public class ThinClientURICatalog extends URICatalog implements } public void requeryAllMenuTimes() { - Map, List> map = new HashMap, List>(); - for (DataPair pair : getDataPairs()) { - map.put(pair.metadata, pair.data); + if (enableMenuTimes) { + Map, List> map = new HashMap, List>(); + for (DataPair pair : getDataPairs()) { + map.put(pair.metadata, pair.data); + } + queryMenuTimes(map, null, false); } - queryMenuTimes(map, null, false); } } diff --git a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/SatelliteDataCubeAdapter.java b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/SatelliteDataCubeAdapter.java index 6ce7ea4017..f7bb8f0325 100644 --- a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/SatelliteDataCubeAdapter.java +++ b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/SatelliteDataCubeAdapter.java @@ -58,6 +58,7 @@ import com.raytheon.uf.common.geospatial.MapUtil; import com.raytheon.uf.common.pointdata.PointDataContainer; import com.raytheon.uf.common.time.BinOffset; import com.raytheon.uf.common.time.DataTime; +import com.raytheon.uf.common.time.SimulatedTime; import com.raytheon.uf.viz.core.HDF5Util; import com.raytheon.uf.viz.core.catalog.CatalogQuery; import com.raytheon.uf.viz.core.catalog.LayerProperty; @@ -541,6 +542,7 @@ public class SatelliteDataCubeAdapter implements IDataCubeAdapter { DerivParamField field = (DerivParamField) ifield; TimeQueryRequest newRequest = new TimeQueryRequest(); newRequest.setBinOffset(binOffset); + newRequest.setSimDate(SimulatedTime.getSystemTime().getTime()); newRequest.setMaxQuery(false); newRequest.setQueryTerms(modifyQuery(queryParams, field)); newRequest.setPluginName("satellite"); diff --git a/edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py b/edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py index d076758484..c928079efe 100644 --- a/edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py +++ b/edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py @@ -1,19 +1,19 @@ ## # 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. ## @@ -62,7 +62,8 @@ class ObsRequest(PointDataQuery.PointDataQuery): self._pdq.setParameters(MetarPointDataTransform.ALL_PARAMS_LIST) self.queryResults = self._pdq.execute() if self.queryResults is None: - self.makeNullResponse() + response = ArrayList() + return response else: records = MetarPointDataTransform.toMetarRecords(self.queryResults) size = len(records) diff --git a/edexOsgi/build.edex/tmp/includes/core.includes b/edexOsgi/build.edex/tmp/includes/core.includes index b229dc770a..b5f4413a14 100644 --- a/edexOsgi/build.edex/tmp/includes/core.includes +++ b/edexOsgi/build.edex/tmp/includes/core.includes @@ -1,4 +1,4 @@ -## Core includes file generated on 2012-01-20 17:08:45 GMT +## Core includes file generated on 2012-01-24 20:30:22 GMT com.raytheon.edex.rpgenvdata/component-deploy.xml com.raytheon.uf.common.jms/component-deploy.xml com.raytheon.uf.edex.database/component-deploy.xml diff --git a/edexOsgi/build.edex/tmp/includes/cots.includes b/edexOsgi/build.edex/tmp/includes/cots.includes index 1fc912c95c..95b3c9d04b 100644 --- a/edexOsgi/build.edex/tmp/includes/cots.includes +++ b/edexOsgi/build.edex/tmp/includes/cots.includes @@ -1,4 +1,4 @@ -## Cots includes file generated on 2012-01-20 17:08:45 GMT +## Cots includes file generated on 2012-01-24 20:30:22 GMT com.sun.jndi.nis/*.jar net.sf.ehcache/*.jar javax.persistence/*.jar diff --git a/edexOsgi/build.edex/tmp/includes/plugins.includes b/edexOsgi/build.edex/tmp/includes/plugins.includes index a38b6972d2..0246843b10 100644 --- a/edexOsgi/build.edex/tmp/includes/plugins.includes +++ b/edexOsgi/build.edex/tmp/includes/plugins.includes @@ -1,4 +1,4 @@ -## Plug-in includes file generated on 2012-01-20 17:08:45 GMT +## Plug-in includes file generated on 2012-01-24 20:30:22 GMT com.raytheon.uf.edex.plugin.satellite.mcidas/component-deploy.xml com.raytheon.edex.plugin.ldadhydro/component-deploy.xml com.raytheon.uf.edex.plugin.loctables/component-deploy.xml diff --git a/edexOsgi/build.edex/tmp/uengine/com.raytheon.edex.common.jar b/edexOsgi/build.edex/tmp/uengine/com.raytheon.edex.common.jar index 128f3525a9..4eca5dab04 100644 Binary files a/edexOsgi/build.edex/tmp/uengine/com.raytheon.edex.common.jar and b/edexOsgi/build.edex/tmp/uengine/com.raytheon.edex.common.jar differ diff --git a/edexOsgi/build.edex/tmp/uengine/com.raytheon.uf.common.serialization.jar b/edexOsgi/build.edex/tmp/uengine/com.raytheon.uf.common.serialization.jar index 343c4c9e7c..e04342cf0c 100644 Binary files a/edexOsgi/build.edex/tmp/uengine/com.raytheon.uf.common.serialization.jar and b/edexOsgi/build.edex/tmp/uengine/com.raytheon.uf.common.serialization.jar differ diff --git a/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/requests/TimeQueryRequest.java b/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/requests/TimeQueryRequest.java index 732851b889..0cf4c83020 100644 --- a/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/requests/TimeQueryRequest.java +++ b/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/requests/TimeQueryRequest.java @@ -19,6 +19,7 @@ **/ package com.raytheon.uf.common.dataquery.requests; +import java.util.Date; import java.util.Map; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; @@ -53,6 +54,9 @@ public class TimeQueryRequest implements IServerRequest { @DynamicSerializeElement private boolean maxQuery; + @DynamicSerializeElement + private Date simDate; + @DynamicSerializeElement private Map queryTerms; @@ -91,11 +95,19 @@ public class TimeQueryRequest implements IServerRequest { return queryTerms; } + public void setSimDate(Date simDate) { + this.simDate = simDate; + } + + public Date getSimDate() { + return simDate; + } + @Override public String toString() { return "TimeQueryRequest [pluginName=" + pluginName + ", maxQuery=" + maxQuery + ", queryTerms=" + queryTerms + ", binOffset=" - + binOffset + "]"; + + binOffset + " simDate=" + simDate + " ]"; } } diff --git a/edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/handlers/TimeQueryHandler.java b/edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/handlers/TimeQueryHandler.java index ba94ce5e95..ab0b0335d3 100644 --- a/edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/handlers/TimeQueryHandler.java +++ b/edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/handlers/TimeQueryHandler.java @@ -70,6 +70,16 @@ public class TimeQueryHandler implements IRequestHandler { map.remove("pluginName"); } + // Simulated Date is the date set in the CAVE calling this + if (request.getSimDate() != null) { + RequestConstraint timeConstraint = new RequestConstraint(); + timeConstraint.setConstraintType(ConstraintType.LESS_THAN); + timeConstraint + .setConstraintValue(new DataTime(request.getSimDate()) + .toString()); + map.put(REF_TIME, timeConstraint); + } + String database = PluginFactory.getInstance().getDatabase( request.getPluginName()); String classname = PluginFactory.getInstance() @@ -136,6 +146,7 @@ public class TimeQueryHandler implements IRequestHandler { constraint.getConstraintType().getOperand(), classname); } + //System.out.println("TimeQuery: " + query.createHQLQuery()); return query; }