Skip to content
Snippets Groups Projects
Commit 915b3c32 authored by Rivers, Travis (Contractor) Creighton's avatar Rivers, Travis (Contractor) Creighton Committed by Jeremy M Fee
Browse files

change created parameter behavior

parent 2aa285e9
No related branches found
No related tags found
2 merge requests!146Release CMO metadata to production,!46Webservice query
Hide whitespace changes
Inline Side-by-side
geomagio/api/db/metadata_table.py
+ 4
− 7
View file @ 915b3c32
...@@ -112,7 +112,6 @@ async def get_metadata( ...@@ -112,7 +112,6 @@ async def get_metadata(
query = query.where(metadata.c.id == id) query = query.where(metadata.c.id == id)
if category: if category:
query = query.where(metadata.c.category == category) query = query.where(metadata.c.category == category)
if network or station or channel or location: if network or station or channel or location:
query = ( query = (
query.where(metadata.c.network.like(network or "%")) query.where(metadata.c.network.like(network or "%"))
...@@ -128,12 +127,10 @@ async def get_metadata( ...@@ -128,12 +127,10 @@ async def get_metadata(
query = query.where( query = query.where(
or_(metadata.c.starttime == None, metadata.c.starttime < endtime) or_(metadata.c.starttime == None, metadata.c.starttime < endtime)
) )
if created_after:
if created_before and created_after: query = query.where(metadata.c.starttime > created_after)
query = query.where( if created_before:
or_(metadata.c.created_time.between(created_after, created_before)) query = query = query.where(metadata.c.endtime < created_before)
)
if data_valid is not None: if data_valid is not None:
query = query.where(metadata.c.data_valid == data_valid) query = query.where(metadata.c.data_valid == data_valid)
if metadata_valid is not None: if metadata_valid is not None:
......
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