Skip to content

A couple fixes to institutions stuff #430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 25, 2015
Merged

A couple fixes to institutions stuff #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d371f01
serialize json correctly, allow query string searching
fabianvf Nov 25, 2015
329da59
remove unnecessary encode to bytes step
fabianvf Nov 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions api/webview/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,25 @@ def status(request):
return HttpResponse(json.dumps({'status': 'ok'}), content_type='application/json', status=200)


@api_view(['POST'])
@api_view(['GET', 'POST'])
def institutions(request):
if not es:
return HttpResponse('No connection to elastic search', status=503)
query = request.data.get('query') or {}
if request.data.get('query') or request.query_params.get('q'):
query = request.data.get('query') or {
'query': {
'query_string': {
'query': request.query_params.get('q')
}
}
}
else:
query = {
'query': {
'match_all': {}
}
}

es.indices.create(index='institutions', ignore=400)
res = es.search(index=settings.ELASTIC_INST_INDEX, body=query)
# validate query and grab whats wanted
Expand All @@ -87,4 +101,4 @@ def institutions(request):
}
except IndexError:
return Response('Invalid query', status=400)
return Response(json.dumps(res), status=200)
return Response(res, status=200)
4 changes: 2 additions & 2 deletions institutions/grid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
logger = logging.getLogger(__name__)

schema = {
'name': ('/name', lambda x: x.encode('utf8') if x else None),
'name': ('/name'),
'location': {
'street_address': ('/addresses', lambda x: x[0]['line_1'] if x else None),
'city': ('/addresses', lambda x: x[0]['city'] if x else None),
Expand All @@ -19,7 +19,7 @@
},
'web_url': ('/links', lambda x: x[0] if x else None),
'id_': '/id',
'other_names': ('/aliases', '/acronyms', lambda x, y: x + y if x and y else x if x else y if y else None)
'other_names': ('/aliases', '/acronyms', lambda x, y: (x or []) + (y or []))
}


Expand Down