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

Issue #2636 - Fix point scheduling

Browse source 
Former-commit-id: 2c4f25ae81 [formerly af45ad9ac1] [formerly 2c4f25ae81 [formerly af45ad9ac1] [formerly c0e7aa2af3 [formerly 6291c630ca3c1999870eb6045c95131153b1d305]]]
Former-commit-id: c0e7aa2af3
Former-commit-id: e02576f737 [formerly f04058849f]
Former-commit-id: 190964c224
This commit is contained in:
Mike Duff 2014-01-26 18:59:10 -06:00
parent a33a533acc
commit 5fb0034000
1 changed files with 6 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
View file

@ -193,63 +193,38 @@ public class BandwidthDaoUtil<T extends Time, C extends Coverage> {
subscriptionCalculatedStart, Calendar.MINUTE, Calendar.SECOND,
Calendar.MILLISECOND);
subscriptionCalculatedStart.add(Calendar.HOUR_OF_DAY, -6);
Calendar start = (Calendar) subscriptionCalculatedStart.clone();
int availabilityOffset = 0;
try {
availabilityOffset = BandwidthUtil.getDataSetAvailablityOffset(
subscription, start);
} catch (RegistryHandlerException e) {
// Error occurred querying the registry. Log and continue on
statusHandler
.handle(Priority.PROBLEM,
"Unable to retrieve data availability offset, using 0 for the offset.",
e);
}
/**
* Check the offset times against the start time and the base time
* against the end time. This prevents a missing download window at the
* beginning and the end
*/
outerloop: while (!start.after(subscriptionCalculatedEnd)) {
for (Integer cycle : hours) {
start.set(Calendar.HOUR_OF_DAY, cycle);
Calendar baseTime = (Calendar) start.clone();
Calendar retrievalTime = TimeUtil.newCalendar(start);
// start base equal-to-or-after subscriptionStart
if (retrievalTime.compareTo(subscriptionCalculatedStart) >= 0) {
if (start.compareTo(subscriptionCalculatedStart) >= 0) {
for (Integer minute : minutes) {
retrievalTime.set(Calendar.MINUTE, minute);
start.set(Calendar.MINUTE, minute);
retrievalTime.add(Calendar.MINUTE, availabilityOffset);
// start minutes equal-to-or-after subscriptionStart
if (retrievalTime
.compareTo(subscriptionCalculatedStart) >= 0) {
if (start.compareTo(subscriptionCalculatedStart) >= 0) {
// Check for nonsense
if (start.after(subscriptionCalculatedEnd)) {
break outerloop;
} else {
Calendar time = TimeUtil.newCalendar();
time.setTimeInMillis(retrievalTime
.getTimeInMillis());
time.setTimeInMillis(start.getTimeInMillis());
/**
* Fine grain check by hour and minute, for
* subscription(start/end),
* activePeriod(start/end)
**/
// Subscription Start and End time first
if (start.after(subscriptionCalculatedEnd)
if (time.after(subscriptionCalculatedEnd)
|| time.before(start)) {
// don't schedule this retrieval time,
// outside subscription window
continue;
}
subscriptionTimes.add(baseTime);
subscriptionTimes.add(time);
}
}
}