logos-co
/
open-law
mirror of https://github.com/logos-co/open-law.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #79 from Simple2B/kostia/fix/case_sensetivity 

fix searchs
This commit is contained in:
Костя Столярский 2023-05-26 15:36:36 +03:00 committed by GitHub
parent bf8e132c87 a44991534c
commit 14b4ce2ff5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/static/js/main.js
View File

File diff suppressed because one or more lines are too long

20
app/views/search.py
View File

@ -34,7 +34,7 @@ def search_interpretations():
@bp.route("/search_books", methods=["GET"])
def search_books():
q = request.args.get("q", type=str, default="")
q = request.args.get("q", type=str, default="").lower()
log(log.INFO, "Starting to build query for books")
books = (
@ -84,7 +84,7 @@ def search_books():
@bp.route("/search_users", methods=["GET"])
def search_users():
q = request.args.get("q", type=str, default="")
q = request.args.get("q", type=str, default="").lower()
users = (
m.User.query.order_by(m.User.id)
.filter(
@ -111,7 +111,7 @@ def search_users():
@bp.route("/search_tags", methods=["GET"])
def search_tags():
q = request.args.get("q", type=str, default="")
q = request.args.get("q", type=str, default="").lower()
tags = m.Tag.query.order_by(m.Tag.id).filter(func.lower(m.Tag.name).like(f"%{q}%"))
count = tags.count()
pagination = create_pagination(total=tags.count())
@ -127,7 +127,7 @@ def search_tags():
@bp.route("/tag_search_interpretations", methods=["GET"])
def tag_search_interpretations():
tag_name = request.args.get("tag_name", type=str, default="")
tag_name = request.args.get("tag_name", type=str, default="").lower()
interpretations = (
db.session.query(m.Interpretation)
.filter(
@ -185,10 +185,13 @@ def tag_search_books():
@bp.route("/quick_search", methods=["GET"])
def quick_search():
search_query = request.args.get("search_query", type=str, default="")
search_query = request.args.get("search_query", type=str, default="").lower()
interpretations = (
m.Interpretation.query.order_by(m.Interpretation.id)
.filter((func.lower(m.Interpretation.plain_text).like(f"%{search_query}%")))
.filter(
(func.lower(m.Interpretation.plain_text).like(f"%{search_query}%")),
m.Interpretation.is_deleted == False, # noqa: E712,
)
.limit(2)
)
interpretations_res = []
@ -199,7 +202,10 @@ def quick_search():
)
books = (
m.Book.query.order_by(m.Book.id)
.filter((func.lower(m.Book.label).like(f"%{search_query}%")))
.filter(
(func.lower(m.Book.label).like(f"%{search_query}%")),
m.Book.is_deleted == False, # noqa: E712,
)
.limit(2)
)
books_res = []

4
src/quickSearch.ts
View File

@ -22,7 +22,7 @@ export function quickSearch() {
currentSearchInput.addEventListener('keypress', async e => {
if (e.key === 'Enter') {
const urlParams = new URLSearchParams({
q: currentSearchInput.value,
q: currentSearchInput.value.toLowerCase(),
});
const res = await fetch('/search_interpretations?' + urlParams);
if (res.status === 200) {
@ -39,7 +39,7 @@ const onInputChange = async (e: any) => {
e.preventDefault();
if (currentSearchInput.value.length > 0) {
const urlParams = new URLSearchParams({
search_query: currentSearchInput.value,
search_query: currentSearchInput.value.toLowerCase(),
});
const res = await fetch('/quick_search?' + urlParams);
const json = await res.json();