|
@@ -78,6 +78,7 @@ class NavigatorApi(object):
|
|
|
:param filters: TODO: IMPLEMENT ME, required to support property search
|
|
:param filters: TODO: IMPLEMENT ME, required to support property search
|
|
|
"""
|
|
"""
|
|
|
search_fields = ('originalName', 'originalDescription', 'name', 'description', 'tags')
|
|
search_fields = ('originalName', 'originalDescription', 'name', 'description', 'tags')
|
|
|
|
|
+ entity_types = ('DATABASE', 'TABLE', 'PARTITION', 'FIELD', 'FILE', 'OPERATION')
|
|
|
|
|
|
|
|
try:
|
|
try:
|
|
|
params = self.__params
|
|
params = self.__params
|
|
@@ -88,10 +89,13 @@ class NavigatorApi(object):
|
|
|
for term in search_terms:
|
|
for term in search_terms:
|
|
|
query_clauses.append('OR'.join(['(%s:*%s*)' % (field, term) for field in search_fields]))
|
|
query_clauses.append('OR'.join(['(%s:*%s*)' % (field, term) for field in search_fields]))
|
|
|
|
|
|
|
|
- filter_query = '*.*'
|
|
|
|
|
|
|
+ filter_query = '(originalName:*.*)'
|
|
|
if search_terms:
|
|
if search_terms:
|
|
|
filter_query = 'OR'.join(['(%s)' % clause for clause in query_clauses])
|
|
filter_query = 'OR'.join(['(%s)' % clause for clause in query_clauses])
|
|
|
|
|
|
|
|
|
|
+ type_filter_clause = 'OR'.join(['(%s:%s)' % ('type', entity_type) for entity_type in entity_types])
|
|
|
|
|
+ filter_query = '%sAND(%s)' % (filter_query, type_filter_clause)
|
|
|
|
|
+
|
|
|
params += (
|
|
params += (
|
|
|
('query', filter_query),
|
|
('query', filter_query),
|
|
|
('offset', offset),
|
|
('offset', offset),
|