mirror of
https://github.com/th3r00t/pyShelf.git
synced 2026-04-28 01:59:35 -04:00
Implemented basic search functionality
This commit is contained in:
@@ -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
|
||||||
|
|||||||
@@ -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):
|
||||||
|
try:
|
||||||
results = Books.objects.annotate(
|
results = Books.objects.annotate(
|
||||||
search=SearchVector("author", "title", "file_name")
|
search=SearchVector("author", "title", "file_name"),
|
||||||
).filter(str(query))
|
).filter(search=query)
|
||||||
|
except Exception as e:
|
||||||
|
raise
|
||||||
return results
|
return results
|
||||||
|
|||||||
7
src/interface/static/js/pyshelf_ux.js
vendored
7
src/interface/static/js/pyshelf_ux.js
vendored
@@ -0,0 +1,7 @@
|
|||||||
|
$(document).ready(function(){
|
||||||
|
$(".search_submit").click(function(){
|
||||||
|
var query = $('.nav_search').val();
|
||||||
|
console.log(query);
|
||||||
|
window.location.href = '/search/'+query;
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|||||||
2
src/interface/templates/index.html
vendored
2
src/interface/templates/index.html
vendored
@@ -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 }}'">
|
||||||
|
|||||||
@@ -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
|
|
||||||
else:
|
|
||||||
try:
|
try:
|
||||||
_r = Books().generic_search(query)
|
_r = Books().generic_search(query)
|
||||||
return _r
|
return render(request, "index.html", {"Books": _r})
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
return e
|
raise
|
||||||
|
|
||||||
|
|
||||||
def book_set(_limit=None, _set=1):
|
def book_set(_limit=None, _set=1):
|
||||||
|
|||||||
Reference in New Issue
Block a user