EbookFoundation
/
cce-search-prototype
mirror of https://github.com/EbookFoundation/cce-search-prototype.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'new-ui' of https://github.com/EbookFoundation/cce-search-prototype into kim-ui

pull/4/head
Rachel Kim 2020-02-27 15:49:57 -05:00
parent ab29869113 e012c1bffa
commit 9014098031
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cce_search/search.py
View File

@ -16,18 +16,19 @@ def index():
paging=None
sentTitle = None
search_type = "ft"
arguments = request.args.get("title") or request.args.get("renewal") or request.args.get("registration") or request.args.get("author") or request.args.get("publisher")
print("TEST HERE")
print(request.args)
print(request.args.get("title"))
print("----------------------------------------------------------")
if request.args:
if not arguments:
print("NO ARGUMENTS GIVEN. PLEASE GIVE ARGUMENTS")
else:
if request.args.get("title"):
title = request.args['title']
print("TITLE HERE")
sentTitle = search(request.args['title'], request.args.get('page'),
request.args.get('per_page'))
#print(sentTitle)
if request.args.get("renewal"):
print("UNIQUE. THERE IS RENEWAL. NEED TO BREAK FROM THIS UNLESS NO RESULTS SHOW")
sentAuthor = ren_search(request.args['renewal'], request.args.get('page'),
@ -45,17 +46,17 @@ def index():
print("THERE IS AN PUBLISHER")
sentAuthor = search(request.args['publisher'], request.args.get('page'),
request.args.get('per_page'))
paging = proc_pagination(sentTitle['data']['paging'],
request.args.get('page'))
print("PRINTING PAGING HERE")
print(paging)
results = proc_results(sentTitle)
#print("-----------PRINTING RESULTS AQUI---------------")
#print(results)
#THIS WILL BREAK IF THERE ARE NO RESULTS AT THE MOMENT- NEED TO FIX
#breaks if there are few results, or if you click on last page
#makes me think there's an issue with a for loop that is rendering the results since the last result won't display?
return render_template('search/index.html', results=results, term=sentTitle,
paging=paging, search_type=search_type)
paging=paging, search_type=search_type)
def proc_results(r):

14
cce_search/templates/search/index.html
View File

@ -9,11 +9,7 @@
{% for result in results %}
<div class = "results">
{% if result['type'] %}
{% include "search/render_renewal.html" %}
{% else %}
{% include "search/render_registration.html" %}
{% endif %}
</div>
{% endfor %}
@ -35,8 +31,16 @@
</div>
</div>
{% endif %}
{% if noresults %}
<div class = "results">
<h1>No Results Found.</h1>
<a href="/">Back To Search</a>
</div>
{% endif %}
{% include "search/paging.html" %}
{% endblock %}