Commit 7998e24e authored by Javier Quinteros's avatar Javier Quinteros

Bugfix: Network, location and channel returned from CFG file instead of hardcoded in StationWS

parent b9a390cc
......@@ -421,10 +421,11 @@ class StationAPI(object):
stt = data['starttime']
ent = data['endtime']
if level == 'station':
key = 'XX|%s||FH1|%s|%s|%s|%s' % (data['id'], lat, lon, elev, self.__sitename)
key = '%s|%s|%s|%s|%s|%s' % (self.__net, data['id'], lat, lon, elev, self.__sitename)
else:
key = 'XX|%s||FH1|%s|%s|%s|depth|azimuth|dip|DAS|Scale|ScaleFrequency|ScaleUnits|%s' % \
(data['id'], lat, lon, elev, samprate)
key = '%s|%s|%s|%s|%s|%s|%s|depth|azimuth|dip|DAS|Scale|ScaleFrequency|ScaleUnits|%s' % \
(self.__net, data['id'], self.__loc if self.__loc != '--' else '', self.__cha,
lat, lon, elev, samprate)
if key in result:
# Get the minimum starttime
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment