diff --git a/src/DDSERVICES/HAPI/reader.py b/src/DDSERVICES/HAPI/reader.py index 080f1eb..a652504 100644 --- a/src/DDSERVICES/HAPI/reader.py +++ b/src/DDSERVICES/HAPI/reader.py @@ -16,6 +16,7 @@ import shutil import gzip import tempfile import time +import calendar import datetime import dateutil.parser import xml.etree.ElementTree as ET @@ -255,9 +256,8 @@ def get_start_stop_from_times_nc_file(metadata, localpath, tmin, tmax): localpath = metadata['LOCATION'] times_nc_file = "{}{}".format(localpath, metadata['TIMES']) - - start = time.mktime(tmin.timetuple()) - stop = time.mktime(tmax.timetuple()) + start = calendar.timegm(tmin.timetuple()) + stop = calendar.timegm(tmax.timetuple()) command = _GETFILENAMES+' '+str(times_nc_file)+' '+str(start)+' '+str(stop) result = subprocess.check_output(command, shell=True) @@ -339,9 +339,8 @@ def main(argv): para_index = None para_name = par var_index[para_name].append(para_index) - + #variables = OrderedDict([(key, variables[key]) for key in para]) - if tmin <= cur_end_time and tmax >= cur_start_time: # checking if file contains data within interval # time = [amda_to_datetime(cur_time) for cur_time in nc.variables['Time']] time = map(amda_to_datetime, nc.variables['Time']) @@ -351,9 +350,7 @@ def main(argv): break if cur_dt >= tmin and cur_dt <= tmax: - - stream = '{}'.format(cur_dt.isoformat()) - + stream = '{}'.format(cur_dt.isoformat()) for var in variables: if not 'Time' in var: cur_data = nc.variables[var][cur_index] -- libgit2 0.21.2