From 1301f6ba6c6ea31bdbcd3619d7f235912726f30a Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Tue, 28 Jul 2020 15:54:44 -0700 Subject: refactor search macros into new file --- python/fatcat_web/templates/container_search.html | 6 +-- python/fatcat_web/templates/entity_macros.html | 40 -------------- python/fatcat_web/templates/release_search.html | 5 +- python/fatcat_web/templates/search_macros.html | 66 +++++++++++++++++++++++ 4 files changed, 72 insertions(+), 45 deletions(-) create mode 100644 python/fatcat_web/templates/search_macros.html diff --git a/python/fatcat_web/templates/container_search.html b/python/fatcat_web/templates/container_search.html index 2566f542..ce868991 100644 --- a/python/fatcat_web/templates/container_search.html +++ b/python/fatcat_web/templates/container_search.html @@ -1,4 +1,4 @@ -{% import "entity_macros.html" as entity_macros %} +{% import "search_macros.html" as search_macros %} {% extends "base.html" %} {% block title %} @@ -32,7 +32,7 @@ {% if found %} {% if found.results %} - {{ entity_macros.top_results(query, found) }} + {{ search_macros.top_results(query, found) }} {% for entity in found.results %}
@@ -55,7 +55,7 @@ {% if found.results|length > 8 %}
- {{ entity_macros.bottom_results(query, found, endpoint='container_search') }} + {{ search_macros.bottom_results(query, found, endpoint='container_search') }}
{% endif %} diff --git a/python/fatcat_web/templates/entity_macros.html b/python/fatcat_web/templates/entity_macros.html index 0e7f135a..ab0e817a 100644 --- a/python/fatcat_web/templates/entity_macros.html +++ b/python/fatcat_web/templates/entity_macros.html @@ -262,43 +262,3 @@ yellow {% endif %} {%- endmacro %} -{% macro top_results(query, found) -%} - -Showing - {% if found.offset == 0 %} - first - {% else %} - results {{ found.offset }} — - {% endif %} - - {{ found.offset + found.count_returned }} - out of {{ found.count_found }} results - - -{%- endmacro %} - - -{% macro bottom_results(query, found, endpoint='release_search') -%} - -{% if found.offset > 0 %} - {% if found.offset - found.limit < 0 %} - « Previous - {% else %} - « Previous - {% endif %} -{% else %} - « Previous -{% endif %} - -  Showing results {{ found.offset }} — {{ found.offset + -found.count_returned }} out of {{ found.count_found }} results   - -{% if found.offset + found.limit < found.count_found and found.offset + found.limit < found.deep_page_limit %} - Next » - {% else %} - Next » -{% endif %} - -
- -{%- endmacro %} diff --git a/python/fatcat_web/templates/release_search.html b/python/fatcat_web/templates/release_search.html index 58aa35d6..e004efc1 100644 --- a/python/fatcat_web/templates/release_search.html +++ b/python/fatcat_web/templates/release_search.html @@ -1,4 +1,5 @@ {% import "entity_macros.html" as entity_macros %} +{% import "search_macros.html" as search_macros %} {% extends "base.html" %} {% block title %} @@ -37,7 +38,7 @@ {% if found %} {% if found.results %} - {{ entity_macros.top_results(query, found) }} + {{ search_macros.top_results(query, found) }} {% for paper in found.results %} {{ entity_macros.release_search_result_row(paper) }} @@ -46,7 +47,7 @@ {% if found.results|length > 8 %}
- {{ entity_macros.bottom_results(query, found, endpoint='release_search') }} + {{ search_macros.bottom_results(query, found, endpoint='release_search') }}
{% endif %} diff --git a/python/fatcat_web/templates/search_macros.html b/python/fatcat_web/templates/search_macros.html new file mode 100644 index 00000000..383c271c --- /dev/null +++ b/python/fatcat_web/templates/search_macros.html @@ -0,0 +1,66 @@ + +{% macro top_results(query, found) -%} + +Showing + {% if found.offset == 0 %} + first + {% else %} + results {{ found.offset }} — + {% endif %} + + {{ found.offset + found.count_returned }} + out of {{ found.count_found }} results + + +{%- endmacro %} + + +{% macro bottom_results(query, found, endpoint='release_search') -%} + +{% if found.offset > 0 %} + {% if found.offset - found.limit < 0 %} + « Previous + {% else %} + « Previous + {% endif %} +{% else %} + « Previous +{% endif %} + +  Showing results {{ found.offset }} — {{ found.offset + +found.count_returned }} out of {{ found.count_found }} results   + +{% if found.offset + found.limit < found.count_found and found.offset + found.limit < found.deep_page_limit %} + Next » + {% else %} + Next » +{% endif %} + + + +{%- endmacro %} + + +{% macro es_error_msg(es_error) %} +
+ + {% if es_error.status_code == 400 %} +
+
+ Query Error +
+

Computer said: {{ es_error.description }} +

Query parsing is currently very naive. Sometimes you can fix this + problem by adding quotes around terms or entire phrases. +

+ {% else %} +
+
+ Search Index Error ({{ es_error.status_code }}) +
+

Computer said: {{ es_error.description }} +

+ {% endif %} +
+{% endmacro %} + -- cgit v1.2.3