forked from Ugric/Komodo-Hub
article searching working
This commit is contained in:
1 parent
23884c2bad
commit
1e8f3b67f3
3 files changed
+30
-3
No files matched your search
@@ -137,6 +137,18 @@ WHERE
|
||||
(query.lower(),)
|
||||
).fetchall()
|
||||
return [dict(row) for row in rows]
|
||||
|
||||
def search_articles(query):
|
||||
with get_db() as conn:
|
||||
rows = conn.execute("""SELECT * FROM articles WHERE
|
||||
instr(LOWER(COALESCE(CAST(article_id AS TEXT), '')), ?1) > 0
|
||||
OR instr(LOWER(COALESCE(CAST(title AS TEXT), '')), ?1) > 0
|
||||
OR instr(LOWER(COALESCE(CAST(subtitle AS TEXT), '')), ?1) > 0
|
||||
OR instr(LOWER(COALESCE(CAST(author AS TEXT), '')), ?1) > 0
|
||||
OR instr(LOWER(COALESCE(CAST(publish_date AS TEXT), '')), ?1) > 0;""",
|
||||
(query.lower(),)
|
||||
).fetchall()
|
||||
return [dict(row) for row in rows]
|
||||
|
||||
def delete_species(species_id):
|
||||
with get_db() as conn:
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from flask import render_template, Blueprint, request
|
||||
import configparser
|
||||
|
||||
from database.db_commands import get_all_articles, search_species, get_species_by_name
|
||||
from database.db_commands import get_all_articles, search_articles, get_species_by_name
|
||||
from utilities.featured_species import featured_species_function
|
||||
|
||||
config = configparser.ConfigParser()
|
||||
@@ -25,6 +25,6 @@ def all_species():
|
||||
def search():
|
||||
query = request.args.get("search-query")
|
||||
|
||||
results = search_species(query)
|
||||
results = search_articles(query)
|
||||
print(results)
|
||||
return render_template("/species/species_search.jinja", results=results, query=query)
|
||||
return render_template("/library/article_search.jinja", results=results, query=query)
|
||||
@@ -0,0 +1,15 @@
|
||||
{% extends "base.jinja" %}
|
||||
{% block title %}Species Database{% endblock %}
|
||||
{% block head %}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
{% from 'button.jinja' import button %}
|
||||
{% from 'display_items.jinja' import display_all_articles %}
|
||||
{% from 'search_bar.jinja' import search_bar%}
|
||||
<section class="title">
|
||||
Article Library
|
||||
</section>
|
||||
{# All Species #}
|
||||
{{search_bar("/articles/search", query)}}
|
||||
{{display_all_articles(results)}}
|
||||
{% endblock %}
|
||||
Reference in new issue
Block a user