From 9d926fcac765ef61b4e28581d9087789261f00c0 Mon Sep 17 00:00:00 2001
From: Brian Moe <brian.moe@ligo.org>
Date: Thu, 13 Jun 2013 13:08:13 -0500
Subject: [PATCH] Fixes https://bugs.ligo.org/redmine/issues/924
Query on "Submitter" Broken.
---
gracedb/query.py | 2 +-
templates/gracedb/query_help_frag.html | 10 ++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/gracedb/query.py b/gracedb/query.py
index c6420c731..c00f64ed1 100644
--- a/gracedb/query.py
+++ b/gracedb/query.py
@@ -122,7 +122,7 @@ eidQ = Optional(Suppress(Keyword("eid:"))) + (eid^eidRange)
eidQ = eidQ.setParseAction(maybeRange("eid", dbname="id"))
# Submitter
-submitter = QuotedString('"').setParseAction(lambda toks: Q(submitter__name=toks[0]))
+submitter = QuotedString('"').setParseAction(lambda toks: Q(submitter__username=toks[0]))
submitterQ = Optional(Suppress(Keyword("submitter:"))) + submitter
submitterQ = submitterQ.setParseAction(lambda toks: ("submitter", toks[0]))
diff --git a/templates/gracedb/query_help_frag.html b/templates/gracedb/query_help_frag.html
index a13a7289e..abe924f25 100644
--- a/templates/gracedb/query_help_frag.html
+++ b/templates/gracedb/query_help_frag.html
@@ -55,11 +55,13 @@
<h4>By Submitter</h4>
To specify events from a given submitter, indicate the name of the submitter in double quotes.
- The <code>submitter:</code> is optional.
+ The <code>submitter:</code> is optional. While LIGO user names are predictable, most events
+ are submitted through robot accounts and are not as predictable. This is probably a defect
+ that ought to be remedied.
<ul>
- <li>"CWB Analysis"
- <li>"CWB Analysis" "Omega Analysis"
- <li>submitter: "Joss Whedon" submitter: "Gilligan"
+ <li>"waveburst"
+ <li>"gstlalcbc" "gdb-processor"
+ <li>submitter: "joss.whedon@ligo.org" submitter: "gdb_processor"
</ul>
</div>
--
GitLab