Skip to content

Commit

Permalink
Add support for timeseries index schema version 1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
chad-iris committed Sep 4, 2018
1 parent 429922d commit 8fb57ec
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
2 changes: 1 addition & 1 deletion portable_fdsnws_dataselect/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pkg_path = __file__
version = (1, 1, 6)
version = (1, 2, 0)
13 changes: 12 additions & 1 deletion portable_fdsnws_dataselect/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,19 @@ def verify_configuration(params, level=0):
'format': 'text', 'filemodtime': 'text',
'updated': 'text', 'scanned': 'text'}

# Definition of time series index schema version 1.1
index_version11 = {'network': 'text', 'station': 'text', 'location': 'text',
'channel': 'text', 'quality': 'text', 'version' : 'integer',
'starttime': 'text', 'endtime': 'text',
'samplerate': 'real', 'filename': 'text',
'byteoffset': 'integer', 'bytes': 'integer',
'hash': 'text', 'timeindex': 'text',
'timespans': 'text', 'timerates': 'text',
'format': 'text', 'filemodtime': 'text',
'updated': 'text', 'scanned': 'text'}

# Index table schema is version 1.0
if index_schema != index_version10:
if index_schema != index_version10 and index_schema != index_version11:
raise ConfigError("Schema for index table %s is not recognized" % params['index_table'])

if 'summary_table' in params:
Expand Down

0 comments on commit 8fb57ec

Please sign in to comment.