Merge pull request #686 from pitangainnovare/adequa-search-ao-silver-2

Adequa search ao silver 2

Author: pitangainnovare

search/models.py

@@ -107,11 +107,9 @@ def get_search_request_state(cls, request, *, data_source=None):
 
     @classmethod
     def _resolve_search_sort(cls, data_source, current_sort):
-        if current_sort == "cited_by_count":
+        if current_sort == "most_cited":
             return (
-                data_source.get_index_field_name("cited_by_count")
-                if data_source
-                else "metrics.received_citations.total",
+                "metrics.received_citations.total",
                 "desc",
             )
         return (

search/templates/search/include/result_items/document/book.html

@@ -17,6 +17,16 @@
         {% if doc.source.publication_year %}
         <span class="result-card__source-meta">{{ doc.source.publication_year }}</span>
         {% endif %}
+        {% if doc.source.biblio.pages %}
+            <span class="result-card__source-meta">{% trans "Pages" %} {{ doc.source.biblio.pages }}</span>
+        {% endif %}
+        {% if doc.source.biblio.city or doc.source.biblio.country %}
+            <span class="result-card__source-meta">
+                {% if doc.source.biblio.city %}{{ doc.source.biblio.city }}{% endif %}
+                {% if doc.source.biblio.city and doc.source.biblio.country %} - {% endif %}
+                {% if doc.source.biblio.country %}{{ doc.source.biblio.country }}{% endif %}
+            </span>
+        {% endif %}
         {% if doc.source.metrics.received_citations.total %}
             <span class="result-card__source-meta result-card__source-meta--accent">{% trans "Citations" %}: {{ doc.source.metrics.received_citations.total }}</span>
         {% endif %}
@@ -26,7 +36,13 @@
     <p class="result-card__source-line">
         {% include "search/include/result_items/partials/publishers.html" with publishers=doc.source.publishers only %}
         {% if doc.source.ids.isbn %}
-        <span class="result-card__source-meta">ISBN {{ doc.source.ids.isbn }}</span>
+            <span class="result-card__source-meta">ISBN {{ doc.source.ids.isbn }}</span>
+        {% endif %}
+        {% if doc.source.ids.eisbn %}
+            <span class="result-card__source-meta">eISBN {{ doc.source.ids.eisbn }}</span>
+        {% endif %}
+        {% if doc.source.ids.bisac_code %}
+            <span class="result-card__source-meta">BISAC {% for code in doc.source.ids.bisac_code %}{{ code }}{% if not forloop.last %}, {% endif %}{% endfor %}</span>
         {% endif %}
     </p>
     {% endif %}

search/templates/search/include/result_items/document/dataset.html

@@ -68,6 +68,11 @@
     <div class="result-card__footer">
         <div class="result-card__actions">
             {% block item_footer_actions %}
+                {% if doc.source.files %}
+                    {% for file in doc.source.files %}
+                        <a href="{{ file.pid_url }}" target="_blank" rel="noopener noreferrer" class="result-card__action">{{ file.label }}</a>
+                    {% endfor %}
+                {% endif %}
                 {{ block.super }}
             {% endblock %}
         </div>

search/templates/search/include/results_controls/sort.html

@@ -6,7 +6,7 @@
         <select id="results-sort-select" class="results-controls__select" aria-label="{% trans 'Ordenar resultados' %}">
             <option value="desc" {% if results_data.current_sort == "desc" %}selected{% endif %}>{% trans "Mais recentes" %}</option>
             <option value="asc" {% if results_data.current_sort == "asc" %}selected{% endif %}>{% trans "Mais antigos" %}</option>
-            <option value="cited_by_count" {% if results_data.current_sort == "cited_by_count" %}selected{% endif %}>{% trans "Mais citados" %}</option>
+            <option value="most_cited" {% if results_data.current_sort == "most_cited" %}selected{% endif %}>{% trans "Mais citados" %}</option>
         </select>
     </div>
 </div>

search_gateway/filter_mapping.py

@@ -2,16 +2,87 @@
 from .option_normalization import normalize_boolean
 
 
-def _build_year_range_values(start_value, end_value):
+DEFAULT_YEAR_MIN = 1800
+DEFAULT_YEAR_MAX = 2100
+
+
+def _parse_number_bound(value):
+    try:
+        return int(value) if value not in (None, "") else None
+    except (TypeError, ValueError):
+        return None
+
+
+def _parse_numeric_value(value, *, min_value=None, max_value=None):
     try:
-        start_year = int(start_value) if start_value not in (None, "") else None
+        numeric_value = int(value) if value not in (None, "") else None
     except (TypeError, ValueError):
-        start_year = None
+        return None
+
+    if numeric_value is None:
+        return None
+    if min_value is not None and numeric_value < min_value:
+        return None
+    if max_value is not None and numeric_value > max_value:
+        return None
+    return numeric_value
+
+
+def _build_numeric_range_value(start_value, end_value, *, min_value=None, max_value=None):
+    start_number = _parse_numeric_value(
+        start_value,
+        min_value=min_value,
+        max_value=max_value,
+    )
+    end_number = _parse_numeric_value(
+        end_value,
+        min_value=min_value,
+        max_value=max_value,
+    )
+
+    if start_number is None and end_number is None:
+        return {}
 
+    if start_number is not None and end_number is not None and start_number > end_number:
+        start_number, end_number = end_number, start_number
+
+    range_value = {}
+    if start_number is not None:
+        range_value["gte"] = start_number
+    if end_number is not None:
+        range_value["lte"] = end_number
+    return range_value
+
+
+def _parse_year_value(value, *, min_year=None, max_year=None):
+    try:
+        year = int(value) if value not in (None, "") else None
+    except (TypeError, ValueError):
+        return None
+
+    if year is None:
+        return None
+    min_year = DEFAULT_YEAR_MIN if min_year is None else min_year
+    max_year = DEFAULT_YEAR_MAX if max_year is None else max_year
+    if len(str(abs(year))) != 4:
+        return None
+    if min_year is not None and year < min_year:
+        return None
+    if max_year is not None and year > max_year:
+        return None
+    return year
+
+
+def _parse_year_bound(value):
     try:
-        end_year = int(end_value) if end_value not in (None, "") else None
+        return int(value) if value not in (None, "") else None
     except (TypeError, ValueError):
-        end_year = None
+        return None
+
+
+def _build_year_range_values(start_value, end_value, *, min_year=None, max_year=None):
+    start_year = _parse_year_value(start_value, min_year=min_year, max_year=max_year)
+    end_year = _parse_year_value(end_value, min_year=min_year, max_year=max_year)
 
     if start_year is None and end_year is None:
         return []
@@ -49,7 +120,7 @@ def _map_transformed_filter(field_name, field_info, filters):
             return (real_field_name, normalized_value), handled_fields
         return None, handled_fields
 
-    if transform_type != "year_range":
+    if transform_type not in {"year_range", "numeric_range"}:
         return None, set()
 
     source_names = list(transform.get("sources") or [])
@@ -59,9 +130,28 @@ def _map_transformed_filter(field_name, field_info, filters):
     if len(source_names) != 2:
         return None, handled_fields
 
+    settings = field_info.get("settings") or {}
+    if transform_type == "numeric_range":
+        min_value = _parse_number_bound(settings.get("min"))
+        max_value = _parse_number_bound(settings.get("max"))
+        numeric_range = _build_numeric_range_value(
+            filters.get(source_names[0]),
+            filters.get(source_names[1]),
+            min_value=min_value,
+            max_value=max_value,
+        )
+        if numeric_range:
+            return (real_field_name, numeric_range), handled_fields
+        return None, handled_fields
+
+    min_year = _parse_year_bound(settings.get("min"))
+    max_year = _parse_year_bound(settings.get("max"))
+
     year_values = _build_year_range_values(
         filters.get(source_names[0]),
         filters.get(source_names[1]),
+        min_year=min_year,
+        max_year=max_year,
     )
     if year_values:
         return (real_field_name, year_values), handled_fields

search_gateway/filter_ui.py

@@ -371,7 +371,12 @@ def build_form_field_definition(field, applied_filters=None, options_by_field=No
         "min_value": field.min_value,
         "max_value": field.max_value,
         "step": field.step,
+        "range_start_placeholder": field.ui_settings.get("range_start_placeholder", ""),
+        "range_end_placeholder": field.ui_settings.get("range_end_placeholder", ""),
         "allow_clear": field.allow_clear,
+        "include_all_option": field.include_all_option,
+        "all_option_label": gettext(field.all_option_label),
+        "search_threshold": field.search_threshold,
     }
 
 
@@ -441,6 +446,7 @@ def render_filter_sidebar(
     reset_id="search-gateway-filter-reset",
     reset_type="button",
     filters_error="",
+    hidden_fields=None,
 ):
     payload = build_data_source_form_payload(
         data_source,
@@ -460,6 +466,7 @@ def render_filter_sidebar(
         "reset_id": reset_id,
         "reset_type": reset_type,
         "filters_error": filters_error or " ".join(payload["errors"]).strip(),
+        "hidden_fields": hidden_fields or {},
     }
     html = render_to_string(
         "search_gateway/includes/filter_sidebar.html",