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

Merge "Issue #2636 - Changed delay to offset" into omaha_14.2.1

Browse source 
Former-commit-id: 64598e95a274241197287b3c04e8bd1f9b269179
This commit is contained in:
Richard Peter 2013-12-18 15:38:19 -06:00 • committed by Gerrit Code Review
commit 7d5761111c
2 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/DataSet.java
View file

@ -98,7 +98,7 @@ public abstract class DataSet<T extends Time, C extends Coverage> {
@XmlElement
@DynamicSerializeElement
@SlotAttribute
protected int availabilityDelay;
protected int availabilityOffset;
public Map<String, Parameter> getParameters() {
return parameters;
@ -164,18 +164,18 @@ public abstract class DataSet<T extends Time, C extends Coverage> {
public abstract ServiceType getServiceType();
/**
* @return the availabilityDelay
* @return the availabilityOffset
*/
public int getAvailabilityDelay() {
return availabilityDelay;
public int getAvailabilityOffset() {
return availabilityOffset;
}
/**
* @param availabilityDelay
* the availabilityDelay to set
* @param availabilityOffset
* the availabilityOffset to set
*/
public void setAvailabilityDelay(int availabilityDelay) {
this.availabilityDelay = availabilityDelay;
public void setAvailabilityOffset(int availabilityOffset) {
this.availabilityOffset = availabilityOffset;
}
@Override

11
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPMetaDataParser.java
View file

@ -265,18 +265,15 @@ class OpenDAPMetaDataParser extends MetaDataParser {
// Calculate dataset availability delay
long startMillis = time.getStart().getTime();
long now = TimeUtil.newGmtCalendar().getTimeInMillis();
long delay = (now - startMillis) / TimeUtil.MILLIS_PER_MINUTE;
// There were some models where the availability delay was
// negative
dataSet.setAvailabilityDelay(Math.max(0, (int) delay));
long offset = (now - startMillis) / TimeUtil.MILLIS_PER_MINUTE;
dataSet.setAvailabilityOffset((int) offset);
if (statusHandler.isPriorityEnabled(Priority.DEBUG)) {
statusHandler.debug("Dataset Name: "
+ dataSet.getDataSetName());
statusHandler.debug("StartTime: " + time.getStart());
statusHandler.debug("Delay: "
+ dataSet.getAvailabilityDelay());
statusHandler.debug("Offset: "
+ dataSet.getAvailabilityOffset());
}
} catch (Exception le) {
logParsingException(timecon, "Time", collectionName, url);