From 4a377709c8df17d192ec6d0bb9d786306ea8c6c6 Mon Sep 17 00:00:00 2001
From: Brian Moe <brian.moe@ligo.org>
Date: Mon, 2 Aug 2010 19:37:40 -0500
Subject: [PATCH] Added cWB_r and cWB_s labels.  Reordered parsing rules. Put
 labels earlier in parsing rule so cWB_r isn't mistaken for CWB.

---
 gracedb/query.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gracedb/query.py b/gracedb/query.py
index 54528514e..5639a9fa6 100644
--- a/gracedb/query.py
+++ b/gracedb/query.py
@@ -120,7 +120,7 @@ createdQ = createdQ.setParseAction(maybeRange("created"))
 
 # Labels
 # XXX should we not get these from the DB?
-labelNames = ["DQV", "INJ", "LUMIN_NO", "LUMIN_GO", "SWIFT_NO", "SWIFT_GO", "EM_READY"]
+labelNames = ["DQV", "INJ", "LUMIN_NO", "LUMIN_GO", "SWIFT_NO", "SWIFT_GO", "EM_READY", "cWB_r"," cWB_s"]
 label = Or([CaselessLiteral(n) for n in labelNames]).\
         setParseAction( lambda toks: Q(labels__name=toks[0]) )
 
@@ -138,7 +138,7 @@ labelQ = (Optional(Suppress(Keyword("label:"))) + labelQ_.copy())
 labelQ.setParseAction(lambda toks: ("label", toks[0]))
 
 
-q = (gidQ | hidQ | tidQ | atypeQ | groupQ | labelQ | gpsQ | createdQ | submitterQ).setName("query term")
+q = (gidQ | hidQ | tidQ | labelQ | atypeQ | groupQ | gpsQ | createdQ | submitterQ).setName("query term")
 
 def parseQuery(s):
     d={}
-- 
GitLab