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

@@ -25,6 +25,7 @@ urlpatterns = [
path("prev_page/<bookset>", views.prev_page, name="prev_page"), path("prev_page/<bookset>", views.prev_page, name="prev_page"),
path("next_page/<bookset>", views.next_page, name="next_page"), path("next_page/<bookset>", views.next_page, name="next_page"),
path("search/<query>", views.search, name="search"), path("search/<query>", views.search, name="search"),
path("search/", views.search, name="search"),
] ]
if settings.DEBUG: if settings.DEBUG:
import debug_toolbar import debug_toolbar

View File

@@ -35,7 +35,10 @@ class Books(models.Model):
return reverse("model-detail-view", args=[str(self.id)]) return reverse("model-detail-view", args=[str(self.id)])
def generic_search(self, query): def generic_search(self, query):
results = Books.objects.annotate( try:
search=SearchVector("author", "title", "file_name") results = Books.objects.annotate(
).filter(str(query)) search=SearchVector("author", "title", "file_name"),
).filter(search=query)
except Exception as e:
raise
return results 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 }}'"> <input class="nav_button prev_page" type="button" value="<< Prev Page" onclick="window.location.href = '/prev_page/{{ Set }}'">
</div> </div>
<div class="nav_center_top"> <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>
<div class="nav_right_top"> <div class="nav_right_top">
<input class="nav_button next_page" type="button" value="Next Page >>" onclick="window.location.href = '/next_page/{{ Set }}'"> <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): def search(request, query=None):
breakpoint() if query is None:
if query == None: return render(request, "index.html", {"Books": None})
return False try:
else: _r = Books().generic_search(query)
try: return render(request, "index.html", {"Books": _r})
_r = Books().generic_search(query) except Exception as e:
return _r raise
except Exception as e:
return e
def book_set(_limit=None, _set=1): def book_set(_limit=None, _set=1):