ttygroup/boartty
Code Issues Proposed changes

Support search by tag

Browse Source 
Change-Id: I2d461a0fa6728577964db18f2a0c65711f7dccc2
This commit is contained in:
James E. Blair 2016-11-22 17:40:05 -08:00
parent 95c0c465ab
commit ba75e20eaf
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
boartty/search/__init__.py
View File

@ -51,6 +51,11 @@ class SearchCompiler(object):
result = and_(boartty.db.story_table.c.project_key == boartty.db.project_table.c.key, result = and_(boartty.db.story_table.c.project_key == boartty.db.project_table.c.key,
result) result)
tables.remove(boartty.db.project_table) tables.remove(boartty.db.project_table)
if boartty.db.tag_table in tables:
result = and_(boartty.db.story_tag_table.c.tag_key == boartty.db.tag_table.c.key,
boartty.db.story_tag_table.c.story_key == boartty.db.story_table.c.key,
result)
tables.remove(boartty.db.tag_table)
if boartty.db.user_table in tables: if boartty.db.user_table in tables:
result = and_(boartty.db.story_table.c.user_key == boartty.db.user_table.c.key, result = and_(boartty.db.story_table.c.user_key == boartty.db.user_table.c.key,
result) result)
@ -67,7 +72,7 @@ class SearchCompiler(object):
if __name__ == '__main__': if __name__ == '__main__':
class Dummy(object): class Dummy(object):
pass pass
query = 'recentlyseen:24 hours' query = 'tag:zuulv3'
lexer = tokenizer.SearchTokenizer() lexer = tokenizer.SearchTokenizer()
lexer.input(query) lexer.input(query)
while True: while True:

10
boartty/search/parser.py
View File

@ -86,7 +86,7 @@ def SearchParser():
| projects_term | projects_term
| project_key_term | project_key_term
| branch_term | branch_term
| topic_term | tag_term
| ref_term | ref_term
| label_term | label_term
| message_term | message_term
@ -195,12 +195,12 @@ def SearchParser():
else: else:
p[0] = boartty.db.story_table.c.branch == p[2] p[0] = boartty.db.story_table.c.branch == p[2]
def p_topic_term(p): def p_tag_term(p):
'''topic_term : OP_TOPIC string''' '''tag_term : OP_TAG string'''
if p[2].startswith('^'): if p[2].startswith('^'):
p[0] = func.matches(p[2], boartty.db.story_table.c.topic) p[0] = func.matches(p[2], boartty.db.tag_table.c.name)
else: else:
p[0] = boartty.db.story_table.c.topic == p[2] p[0] = boartty.db.tag_table.c.name == p[2]
def p_ref_term(p): def p_ref_term(p):
'''ref_term : OP_REF string''' '''ref_term : OP_REF string'''

7
boartty/search/tokenizer.py
View File

@ -28,7 +28,7 @@ operators = {
'projects': 'OP_PROJECTS', 'projects': 'OP_PROJECTS',
'_project_key': 'OP_PROJECT_KEY', # internal boartty use only '_project_key': 'OP_PROJECT_KEY', # internal boartty use only
'branch': 'OP_BRANCH', 'branch': 'OP_BRANCH',
'topic': 'OP_TOPIC', 'tag': 'OP_TAG',
'ref': 'OP_REF', 'ref': 'OP_REF',
#'tr': 'OP_TR', # needs trackingids #'tr': 'OP_TR', # needs trackingids
#'bug': 'OP_BUG', # needs trackingids #'bug': 'OP_BUG', # needs trackingids
@ -56,7 +56,6 @@ tokens = [
'LPAREN', 'LPAREN',
'RPAREN', 'RPAREN',
'NUMBER', 'NUMBER',
'STORY_ID',
'SSTRING', 'SSTRING',
'DSTRING', 'DSTRING',
'USTRING', 'USTRING',
@ -75,10 +74,6 @@ def SearchTokenizer():
t.type = operators.get(t.value[:-1], 'OP') t.type = operators.get(t.value[:-1], 'OP')
return t return t
def t_STORY_ID(t):
r'I[a-fA-F0-9]{7,40}'
return t
def t_SSTRING(t): def t_SSTRING(t):
r"'([^\\']+|\\'|\\\\)*'" r"'([^\\']+|\\'|\\\\)*'"
t.value=t.value[1:-1].decode("string-escape") t.value=t.value[1:-1].decode("string-escape")