Minor changes to FederatedASDFDataSet

GeoscienceAustralia · Sep 4, 2023 · 0ff0b4f · 0ff0b4f
1 parent bed16ab
commit 0ff0b4f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/seismic/ASDFdatabase/FederatedASDFDataSet.py b/seismic/ASDFdatabase/FederatedASDFDataSet.py
@@ -122,7 +122,7 @@ def get_closest_stations(self, lon, lat, nn=1):
 
     # end func
 
-    def get_global_time_range(self, network, station, location=None, channel=None):
+    def get_global_time_range(self, network, station=None, location=None, channel=None):
         """
         :param network: network code
         :param station: station code
@@ -132,7 +132,7 @@ def get_global_time_range(self, network, station, location=None, channel=None):
                  min is set to 2100-01-01T00:00:00.000000Z and max is set to 1900-01-01T00:00:00.000000Z
         """
 
-        return self.fds.get_global_time_range(network, station, location=location, channel=channel)
+        return self.fds.get_global_time_range(network, station=station, location=location, channel=channel)
 
     # end func
 

diff --git a/seismic/ASDFdatabase/_FederatedASDFDataSetImpl.py b/seismic/ASDFdatabase/_FederatedASDFDataSetImpl.py
@@ -434,9 +434,11 @@ def decode_tag(tag, type='raw_recording'):
         self.masterinv = cPickle.loads(row[0][0])
     # end func
 
-    def get_global_time_range(self, network, station, location=None, channel=None):
-        query = "select min(st), max(et) from wdb where net='%s' and sta='%s' "%(network, station)
+    def get_global_time_range(self, network, station=None, location=None, channel=None):
+        query = "select min(st), max(et) from wdb where net='%s' "%(network)
 
+        if (station is not None):
+            query += "and sta='%s' "%(station)
         if (location is not None):
             query += "and loc='%s' "%(location)
         if (channel is not None):