From 7492eab5ea99bf069be76328759f744ddb48c0a3 Mon Sep 17 00:00:00 2001
From: Branson Stephens <branson.stephens@ligo.org>
Date: Thu, 4 Jun 2015 14:38:10 -0500
Subject: [PATCH] Query parser modified to make MDC events second class
citizens.
---
gracedb/query.py | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/gracedb/query.py b/gracedb/query.py
index ca647bc9b..319d271b2 100644
--- a/gracedb/query.py
+++ b/gracedb/query.py
@@ -281,8 +281,9 @@ andTheseTags = ["nevents"]
def parseQuery(s):
d={}
if not s:
- # Empty query return everything not in Test group
- return ~Q(group__name="Test")
+ # Empty query return everything not in Test group and not in the MDC group
+ #return ~Q(group__name="Test")
+ return ~Q(group__name="Test") & ~Q(search__name="MDC")
for (tag, qval) in (stringStart + OneOrMore(q) + stringEnd).parseString(s).asList():
if tag in andTheseTags:
d[tag] = d.get(tag,Q()) & qval
@@ -295,6 +296,12 @@ def parseQuery(s):
d["group"] &= ~Q(group__name="Test")
else:
d["group"] = ~Q(group__name="Test")
+ if s.lower().find("mdc") < 0 and "mid" not in d:
+ # If MDC search is not mentioned in the query, we exclude it.
+ if "search" in d:
+ d["search"] &= ~Q(search__name="MDC")
+ else:
+ d["search"] = ~Q(search__name="MDC")
if "tid" in d:
d["tid"] = d["tid"] & Q(group__name="Test")
if "hid" in d:
--
GitLab