diff --git a/elixir/api.py b/elixir/api.py index 123f838..57936f3 100755 --- a/elixir/api.py +++ b/elixir/api.py @@ -46,7 +46,7 @@ class ApiIdentGetterResource: if version == 'latest': version = query.get_latest_tag() - symbol_definitions, symbol_references, symbol_doccomments = query.query('ident', version, ident, family) + symbol_definitions, symbol_references, symbol_doccomments = query.search_ident(version, ident, family) resp.status = falcon.HTTP_200 resp.content_type = falcon.MEDIA_JSON diff --git a/elixir/query.py b/elixir/query.py index bb1466d..731a665 100755 --- a/elixir/query.py +++ b/elixir/query.py @@ -238,22 +238,23 @@ class Query: return [] elif cmd == 'ident': - - # Returns identifier search results - version = args[0] ident = args[1] family = args[2] - # DT bindings compatible strings are handled differently - if family == 'B': - return self.get_idents_comps(version, ident) - else: - return self.get_idents_defs(version, ident, family) + return self.search_ident(version, ident, family) else: return 'Unknown subcommand: ' + cmd + '\n' + # Returns identifier search results + def search_ident(self, version, ident, family): + # DT bindings compatible strings are handled differently + if family == 'B': + return self.get_idents_comps(version, ident) + else: + return self.get_idents_defs(version, ident, family) + # Returns the latest tag that is included in the database. # This excludes release candidates. def get_latest_tag(self): @@ -405,7 +406,7 @@ class Query: def cmd_ident(q, version, ident, family, **kwargs): - symbol_definitions, symbol_references, symbol_doccomments = q.query("ident", version, ident, family) + symbol_definitions, symbol_references, symbol_doccomments = q.search_ident(version, ident, family) print("Symbol Definitions:") for symbol_definition in symbol_definitions: print(symbol_definition) diff --git a/elixir/web.py b/elixir/web.py index a9aba6c..e867803 100755 --- a/elixir/web.py +++ b/elixir/web.py @@ -687,7 +687,7 @@ def generate_ident_page(ctx: RequestContext, q: Query, status = falcon.HTTP_OK source_base_url = get_source_base_url(project, version) - symbol_definitions, symbol_references, symbol_doccomments = q.query('ident', version, ident, family) + symbol_definitions, symbol_references, symbol_doccomments = q.search_ident(version, ident, family) symbol_sections = [] if len(symbol_definitions) or len(symbol_references):