From 7fe007d48283bad5b0d1950238374fa0106555c0 Mon Sep 17 00:00:00 2001
From: Mike Duff <michael.duff@raytheon.com>
Date: Wed, 18 Dec 2013 15:34:00 -0600
Subject: [PATCH] Issue #2636 - Changed delay to offset

Former-commit-id: 14d9978528cf480f991f988bc06666bc7d6f5189 [formerly b5fefc92c0b80613b90acb29f70b96c459167843]
Former-commit-id: fa314e5eb6be8aaef7fa645cf555e8a3dd8cd989
---
 .../uf/common/datadelivery/registry/DataSet.java | 16 ++++++++--------
 .../retrieval/opendap/OpenDAPMetaDataParser.java | 11 ++++-------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/DataSet.java b/edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/DataSet.java
index 4a4c67fc53..da64088909 100644
--- a/edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/DataSet.java
+++ b/edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/DataSet.java
@@ -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
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPMetaDataParser.java b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPMetaDataParser.java
index 47a6938c7f..a0e7d74242 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPMetaDataParser.java
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPMetaDataParser.java
@@ -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);