From 915b3c32fcfa13c35655c0b2c7252fa5cbc6c2bc Mon Sep 17 00:00:00 2001
From: Travis Rivers <trivers@contractor.usgs.gov>
Date: Thu, 5 Nov 2020 18:57:54 -0700
Subject: [PATCH] change created parameter behavior
---
geomagio/api/db/metadata_table.py | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/geomagio/api/db/metadata_table.py b/geomagio/api/db/metadata_table.py
index a605012d..116b77ca 100644
--- a/geomagio/api/db/metadata_table.py
+++ b/geomagio/api/db/metadata_table.py
@@ -112,7 +112,6 @@ async def get_metadata(
query = query.where(metadata.c.id == id)
if category:
query = query.where(metadata.c.category == category)
-
if network or station or channel or location:
query = (
query.where(metadata.c.network.like(network or "%"))
@@ -128,12 +127,10 @@ async def get_metadata(
query = query.where(
or_(metadata.c.starttime == None, metadata.c.starttime < endtime)
)
-
- if created_before and created_after:
- query = query.where(
- or_(metadata.c.created_time.between(created_after, created_before))
- )
-
+ if created_after:
+ query = query.where(metadata.c.starttime > created_after)
+ if created_before:
+ query = query = query.where(metadata.c.endtime < created_before)
if data_valid is not None:
query = query.where(metadata.c.data_valid == data_valid)
if metadata_valid is not None:
--
GitLab