SCRUG-NA/2025
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[installation] Change to nightly

Browse Source
This commit is contained in:
Dirk Rössler
2025-10-30 12:04:59 +01:00
parent 2ff097f9d1
commit a31bc45cce
1441 changed files with 60368 additions and 56360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/python/seiscomp/fdsnws/availability.py
View File

@ -12,8 +12,6 @@
# Email: herrnkind@gempa.de
###############################################################################
from functools import cmp_to_key
from collections import OrderedDict
from twisted.cred import portal
@ -33,7 +31,7 @@ from . import utils
DBMaxUInt = 18446744073709551615 # 2^64 - 1
VERSION = "1.0.3"
VERSION = "1.0.4"
###############################################################################
@ -806,7 +804,7 @@ class FDSNAvailabilityExtent(_Availability):
elif ro.orderBy == ro.VOrderByUpdate:
lines.sort(
key=lambda x: (
x[1].updated().seconds(),
x[1].updated().epoch(),
x[0].waveformID().networkCode(),
x[0].waveformID().stationCode(),
x[0].waveformID().locationCode(),
@ -821,7 +819,7 @@ class FDSNAvailabilityExtent(_Availability):
elif ro.orderBy == ro.VOrderByUpdateDesc:
lines.sort(
key=lambda x: (
-x[1].updated().seconds(),
-x[1].updated().epoch(),
x[0].waveformID().networkCode(),
x[0].waveformID().stationCode(),
x[0].waveformID().locationCode(),
@ -1349,19 +1347,21 @@ class FDSNAvailabilityQuery(_Availability):
if ro.time.start.microseconds() == 0:
q += f"AND {_T('end')} >= '{db.timeToString(ro.time.start)}' "
else:
startTimeStr = db.timeToString(ro.time.start)
q += (
"AND ({0} > '{1}' OR ("
f"{_T('end')} = '{db.timeToString(ro.time.start)}' AND "
f"AND ({_T('end')} > '{startTimeStr}' OR ("
f"{_T('end')} = '{startTimeStr}' AND "
f"end_ms >= {ro.time.start.microseconds()})) "
)
if ro.time.end is not None:
if ro.time.end.microseconds() == 0:
q += f"AND {_T('start')} < '{db.timeToString(ro.time.end)}' "
else:
endTimeStr = db.timeToString(ro.time.end)
q += (
"AND ({0} < '{1}' OR ("
f"{_T('start')} = '{db.timeToString(ro.time.end)}' AND "
"start_ms < {ro.time.end.microseconds()})) "
f"AND ({_T('start')} < '{endTimeStr}' OR ("
f"{_T('start')} = '{endTimeStr}' AND "
f"start_ms < {ro.time.end.microseconds()})) "
)
if ro.quality:
qualities = "', '".join(ro.quality)