Revert "Merge branch 'release/3.15'"

This reverts commit 0008037, reversing
changes made to e189756.

Author: tanhaow

CHANGELOG.rst

@@ -6,35 +6,10 @@ CHANGELOG
 3.15
 ----
 
-Zotero Integration Enhancement:
+Zotero Integration Enhancement: 
 - Improve Zotero integration by changing the old method of MARC and unAPI to COinS metadata.
 - This allows Zotero to automatically detect and import citation data from the PPA archive with the correct item type, PPA URL, page range, etc.
 
-- As a researcher, I want to see the source of the works in my results, so that I can see where the texts are coming from.
-- Revise footer to make menu more flexible (and support moving Technical content page to "About" menu so it is easier to find)
-
-Editorial improvements:
-- As a content editor, I want to add tags to editorial essays so I can categorize and group essays for discovery.
-- As a content editor, I want a way to generating PDFs from editorial essays without developer assistance, so that I can deposit versions of the essays for DOIs.
-- As a user, I want to discover and navigate editorial essays by tag so I can find the content most relevant to my interests.
-- Revise print styles for images in editorial essays
-- Add configuration for DocRaptor API key in Wagtail settings
-
-Maintenance updates and bug fixes:
-- Upgraded to Python 3.12, Django 5.2, Wagtail 7.0
-- Replace deprecated calls in JS/TS code
-- bugfix: disallow requesting nonexistent result pages in archive search pagination
-- bugfix: Fix redirect logic for DigitizedWorkDetailView
-- bugfix: Help text "Displaying x digitized works or clusters of works" reverts
-  to "Displaying x digitized works" after search
-- bugfix: Browser in mobile view hides second hit for keyword search results with 2 hits
-- bugfix: Decrease responsiveness of title and author search fields only
-- bugfix: handle 500 error from Gale API when indexing pages
-
-Developer Documentation:
-- Document how to get PPA full-text content for local development
-
-
 3.14.1
 ----
 

DEPLOYNOTES.rst

@@ -7,7 +7,6 @@ Deploy and Upgrade notes
 ----
 * The footer has been updated such that the Technical page must now be manually set to appear in menus in Wagtail.
 * Need to run `./manage.py index -i work` to update the index for the new COinS metadata for Zotero citation.
-* DocRaptor API key must be configured in Wagtail settings in order to generate PDFs of Editorial essays.
 
 3.14
 ----

ppa/archive/templatetags/ppa_tags.py

@@ -1,12 +1,9 @@
 import re
 
-from django import template
 from django.template.defaultfilters import stringfilter
+from django.template.defaulttags import register
 from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe
-from urllib.parse import urlencode
-
-register = template.Library()
 
 
 @register.filter
@@ -116,169 +113,3 @@ def esc(x):
             ]
         )
     )
-
-
-def _get_item_value(obj, key, default=None):
-    """Get value from Solr object or dictionary.
-    For Solr objects, tries clean field name first, then falls back to
-    raw Solr field name with _s suffix if aliasing isn't working.
-    """
-    if isinstance(obj, dict):
-        return obj.get(key, default)
-    else:
-        # Try clean field name first (from aliasing)
-        value = getattr(obj, key, None)
-        if value is not None:
-            return value
-
-        # Fall back to raw Solr field name with _s suffix
-        raw_field_name = f"{key}_s"
-        return getattr(obj, raw_field_name, default)
-
-
-def _generate_absolute_url(context, item):
-    """Generate absolute URL for the item from Solr result."""
-    from django.urls import reverse
-
-    source_id = _get_item_value(item, "source_id")
-    first_page = _get_item_value(item, "first_page")
-
-    if first_page:
-        detail_url = reverse(
-            "archive:detail",
-            kwargs={"source_id": source_id, "start_page": first_page},
-        )
-    else:
-        detail_url = reverse("archive:detail", kwargs={"source_id": source_id})
-    return context["request"].build_absolute_uri(detail_url)
-
-
-def _add_common_fields(item):
-    """Return common metadata fields from Solr object."""
-    return {
-        "title": _get_item_value(item, "title"),
-        "au": _get_item_value(item, "author"),
-        "date": _get_item_value(item, "pub_date"),
-        "pub": _get_item_value(item, "publisher"),
-        "pub_place": _get_item_value(item, "pub_place"),
-    }
-
-
-def _add_full_work_fields(item, existing_data):
-    """Return fields specific to full works."""
-    return {
-        "rft_val_fmt": "info:ofi/fmt:kev:mtx:book",
-        "genre": "book",
-        "title": existing_data.get("title"),
-        "place": _get_item_value(item, "pub_place"),
-    }
-
-
-def _add_excerpt_fields(item, existing_data):
-    """Return fields specific to excerpts."""
-    fields = {
-        "rft_val_fmt": "info:ofi/fmt:kev:mtx:book",
-        "genre": "bookitem",
-        "atitle": existing_data.get("title"),
-        "btitle": _get_item_value(item, "book_journal"),
-        "place": _get_item_value(item, "pub_place"),
-    }
-
-    # Add page information for excerpts if available
-    first_page = _get_item_value(item, "first_page")
-    if first_page:
-        last_page = _get_item_value(item, "last_page")
-        fields.update(
-            {
-                "spage": first_page,
-                "epage": last_page or first_page,
-                "pages": f"{first_page}-{last_page}"
-                if last_page and last_page != first_page
-                else first_page,
-            }
-        )
-
-    return fields
-
-
-def _add_article_fields(item, existing_data):
-    """Return fields specific to articles."""
-    fields = {
-        "rft_val_fmt": "info:ofi/fmt:kev:mtx:journal",
-        "genre": "article",
-        "atitle": existing_data.get("title"),
-        "jtitle": _get_item_value(item, "book_journal"),
-        "volume": _get_item_value(item, "enumcron"),
-    }
-
-    # Add page information for articles if available
-    first_page = _get_item_value(item, "first_page")
-    if first_page:
-        last_page = _get_item_value(item, "last_page")
-        fields.update(
-            {
-                "spage": first_page,
-                "epage": last_page or first_page,
-                "pages": f"{first_page}-{last_page}"
-                if last_page and last_page != first_page
-                else first_page,
-            }
-        )
-
-    return fields
-
-
-def _add_work_type_specific_fields(item, existing_data, work_type_str):
-    """Return fields based on work type."""
-    if work_type_str == "full-work":
-        return _add_full_work_fields(item, existing_data)
-    elif work_type_str == "excerpt":
-        return _add_excerpt_fields(item, existing_data)
-    elif work_type_str == "article":
-        return _add_article_fields(item, existing_data)
-    return {}
-
-
-@register.simple_tag(takes_context=True)
-def coins_data(context, item):
-    """Generate COinS metadata dictionary for Zotero from Solr results."""
-    work_type_str = _get_item_value(item, "work_type", "full-work")
-    absolute_url = _generate_absolute_url(context, item)
-
-    data = {
-        "ctx_ver": "Z39.88-2004",
-        "rft_id": absolute_url,
-    }
-
-    # Add common fields first
-    common_fields = _add_common_fields(item)
-    data.update(common_fields)
-
-    # Add work-type-specific fields
-    work_type_fields = _add_work_type_specific_fields(item, data, work_type_str)
-    data.update(work_type_fields)
-
-    # Add rft. prefix to fields (except those already prefixed)
-    coins_fields = {
-        f"rft.{k}" if not k.startswith(("rft", "ctx_ver")) else k: v
-        for k, v in data.items()
-        if v is not None  # Skip None values
-    }
-
-    return coins_fields
-
-
-@register.filter
-def coins_encode(coins_data):
-    """Convert COinS metadata dictionary to encoded HTML span element."""
-    if not coins_data:
-        return ""
-
-    title_parts = []
-    for key, value in coins_data.items():
-        if value:
-            encoded_value = urlencode({"": str(value)})[1:]
-            title_parts.append(f"{key}={encoded_value}")
-
-    title_attr = "&".join(str(part) for part in title_parts)
-    return mark_safe(f'<span class="Z3988" title="{title_attr}"></span>')