diff --git a/contrib/stack/topsStack/fetchOrbit.py b/contrib/stack/topsStack/fetchOrbit.py index 9a11fa6..400cacc 100755 --- a/contrib/stack/topsStack/fetchOrbit.py +++ b/contrib/stack/topsStack/fetchOrbit.py @@ -146,7 +146,16 @@ if __name__ == '__main__': for spec in orbitMap: oType = spec[0] - url = server + spec[1] + str(fileTS.year).zfill(2) + '/' + str(fileTS.month).zfill(2) + \ + if oType == 'precise': + queryfmt3 = "%Y-%m-%d %H:%M:%S" + dt = datetime.datetime.strptime(str(fileTS), queryfmt3) + end_date = dt + datetime.timedelta(days=20) + fileTS1 = end_date.strftime(queryfmt3) + url = server + spec[1] + str(fileTS1[0:4]) + '/' + str(fileTS1[5:7]) + \ + '/' + str(fileTS1[8:10]) + '/' + + elif oType == 'restituted': + url = server + spec[1] + str(fileTS.year).zfill(2) + '/' + str(fileTS.month).zfill(2) + \ '/' + str(fileTS.day).zfill(2) + '/' success = False @@ -162,12 +171,17 @@ if __name__ == '__main__': match = os.path.join(resulturl, result) if match is not None: success = True + except: pass - - if match is not None: - res = download_file(match, inps.outdir, session) - if res is False: - print('Failed to download URL: ', match) - else: - print('Failed to find {1} orbits for tref {0}'.format(fileTS, satName)) + + if success: + break + + if match is not None: + + res = download_file(match, inps.outdir, session) + if res is False: + print('Failed to download URL: ', match) + else: + print('Failed to find {1} orbits for tref {0}'.format(fileTS, satName))