diff --git a/dbprocessing/DButils.py b/dbprocessing/DButils.py index 9140645..766d356 100644 --- a/dbprocessing/DButils.py +++ b/dbprocessing/DButils.py @@ -676,11 +676,11 @@ def fileIsNewest(self, filename, debug=False): file = self.getEntry('File', filename) product_id = file.product_id if debug: print('product_id', product_id ) - date = file.utc_file_date + dates = [file.utc_start_time, file.utc_stop_time] if debug: print('date', date) file_id = file.file_id if debug: print('file_id', file_id, file.filename) - latest = self.getFilesByProductDate(product_id, [date]*2, newest_version=True) + latest = self.getFilesByProductTime(product_id, dates, newest_version=True) if len(latest) > 1: raise DBError("More than one latest for a product date") latest_id = latest[0].file_id @@ -1737,8 +1737,8 @@ def getFileDates(self, file_id): Given a file_id or name return the dates it spans """ sq = self.getEntry('File', file_id) - start_time = sq.utc_start_time.date() - stop_time = sq.utc_stop_time.date() + start_time = sq.utc_start_time + stop_time = sq.utc_stop_time return [start_time, stop_time] def file_id_Clean(self, invals): diff --git a/dbprocessing/dbprocessing.py b/dbprocessing/dbprocessing.py index cfb1e3e..f606b3b 100644 --- a/dbprocessing/dbprocessing.py +++ b/dbprocessing/dbprocessing.py @@ -295,10 +295,12 @@ def _getRequiredProducts(self, process_id, file_id, utc_file_date, debug=False): dt = Utils.datetimeToDate(utc_file_date) start = dt - datetime.timedelta(days=y) end = dt + datetime.timedelta(days=t) + starttime = utc_file_date + endtime = utc_file_date kwargs = {'startTime': start, 'endTime': end} \ if timebase in ('DAILY',) \ - else {'startDate': start, 'endDate': end} + else {'startTime': starttime, 'endTime': endtime} tmp_files = self.dbu.getFiles( product=iprod_id, newest_version=True, exists=True, **kwargs) diff --git a/dbprocessing/runMe.py b/dbprocessing/runMe.py index aa73374..a4624cc 100644 --- a/dbprocessing/runMe.py +++ b/dbprocessing/runMe.py @@ -291,8 +291,8 @@ class holds all the info it takes to run a process """ def __init__(self, dbu, utc_file_date, process_id, input_files, pq, version_bump = None, force=False): DBlogging.dblogger.debug("Entered runMe {0}, {1}, {2}, {3}".format(dbu, utc_file_date, process_id, input_files)) - if isinstance(utc_file_date, datetime.datetime): - utc_file_date = utc_file_date.date() + #if isinstance(utc_file_date, datetime.datetime): + # utc_file_date = utc_file_date.date() self.filename = '' # initialize it empty self.ableToRun = False