Implemented basic search functionality

This commit is contained in:
Mike Young
2019-12-13 01:43:18 -05:00
parent 0bef88d1f3
commit 0eeb23c52c
5 changed files with 22 additions and 13 deletions

View File

@@ -35,7 +35,10 @@ class Books(models.Model):
return reverse("model-detail-view", args=[str(self.id)])
def generic_search(self, query):
results = Books.objects.annotate(
search=SearchVector("author", "title", "file_name")
).filter(str(query))
try:
results = Books.objects.annotate(
search=SearchVector("author", "title", "file_name"),
).filter(search=query)
except Exception as e:
raise
return results

View File

@@ -0,0 +1,7 @@
$(document).ready(function(){
$(".search_submit").click(function(){
var query = $('.nav_search').val();
console.log(query);
window.location.href = '/search/'+query;
})
})

View File

@@ -38,7 +38,7 @@
<input class="nav_button prev_page" type="button" value="<< Prev Page" onclick="window.location.href = '/prev_page/{{ Set }}'">
</div>
<div class="nav_center_top">
<input class="nav_search" type="text" size="25" value="-- Not Yet Implemented --"><input class="nav_button" type="submit" value="Search">
<input class="nav_search" type="text" size="25" value=""><input class="nav_button search_submit" type="submit" value="Search">
</div>
<div class="nav_right_top">
<input class="nav_button next_page" type="button" value="Next Page >>" onclick="window.location.href = '/next_page/{{ Set }}'">

View File

@@ -42,15 +42,13 @@ def prev_page(request, bookset):
def search(request, query=None):
breakpoint()
if query == None:
return False
else:
try:
_r = Books().generic_search(query)
return _r
except Exception as e:
return e
if query is None:
return render(request, "index.html", {"Books": None})
try:
_r = Books().generic_search(query)
return render(request, "index.html", {"Books": _r})
except Exception as e:
raise
def book_set(_limit=None, _set=1):