New Release

LICENSE.md

@@ -186,6 +186,7 @@ third-party archives.
     You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
+
 
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,

apps/cms/models.py

@@ -46,7 +46,7 @@ class CollectionsPage(Page):
         FieldPanel('paragraph', classname="full"),
         FieldPanel('layout', classname="full"),
     ]
-    initial = {"sort": "title", "order": "asc", "display": "grid"}
+    initial = {"sort": "title", "order": "asc", "display": "grid", "per_page": "60"}
     sort_fields = {
         "title": "label",
         "added": "created_at",
@@ -99,7 +99,15 @@ def get_context(self, request):
         form = self.get_form(request)
         query_set = self.get_queryset(form, self.collections)
 
-        paginator = Paginator(query_set, 8) # Show 8 collections per page
+        per_page_default = int(self.initial.get("per_page", 20))
+        per_page = per_page_default
+        if form.is_valid():
+            try:
+                per_page = int(form.cleaned_data.get("per_page") or per_page_default)
+            except (TypeError, ValueError):
+                per_page = per_page_default
+
+        paginator = Paginator(query_set, per_page)
 
         page = request.GET.get("page", 1)
         try:
@@ -142,7 +150,7 @@ class VolumesPage(Page):
         FieldPanel('paragraph', classname="full"),
         FieldPanel('layout', classname="full"),
     ]
-    initial = {"sort": "title", "order": "asc", "display": "grid"}
+    initial = {"sort": "title", "order": "asc", "display": "grid", "per_page": "60"}
     sort_fields = {
         "title": "label",
         "author": "author",
@@ -197,7 +205,15 @@ def get_context(self, request):
         form = self.get_form(request)
         query_set = self.get_queryset(form, self.volumes)
 
-        paginator = Paginator(query_set, 8) # Show 8 volumes per page
+        per_page_default = int(self.initial.get("per_page", 60))
+        per_page = per_page_default
+        if form.is_valid():
+            try:
+                per_page = int(form.cleaned_data.get("per_page") or per_page_default)
+            except (TypeError, ValueError):
+                per_page = per_page_default
+
+        paginator = Paginator(query_set, per_page) # Show volumes per selected page size
 
         page = request.GET.get("page", 1)
         try:

apps/iiif/manifests/models.py

@@ -272,6 +272,17 @@ class Meta:  # pylint: disable = too-few-public-methods, missing-class-docstring
         ordering = ["published_date"]
         # indexes = [GinIndex(fields=['search_vector'])]
 
+    @property
+    def authors(self):
+        """Convert authors string into list
+
+        :return: List of authors or ["[no author]"] if author field is empty
+        :rtype: list
+        """
+        if self.author:
+            return [s.strip() for s in self.author.split(";")]
+        return ["[no author]"]
+
     @property
     def publisher_bib(self):
         """Concatenated property for bib citation.

apps/iiif/manifests/tests/tests.py

@@ -94,6 +94,28 @@ def test_properties(self):
             "/iiif/%s/canvas/%s" % (self.volume.pid, self.start_canvas.pid)
         )
 
+    def test_authors_property(self):
+        """Test the authors property returns a list of authors from the author field."""
+        # Test with no author
+        manifest = Manifest(author=None)
+        assert manifest.authors == ["[no author]"]
+
+        # Test with empty string
+        manifest = Manifest(author="")
+        assert manifest.authors == ["[no author]"]
+
+        # Test with single author
+        manifest = Manifest(author="John Doe")
+        assert manifest.authors == ["John Doe"]
+
+        # Test with multiple authors separated by semicolon
+        manifest = Manifest(author="John Doe; Jane Smith")
+        assert manifest.authors == ["John Doe", "Jane Smith"]
+
+        # Test with multiple authors with extra whitespace
+        manifest = Manifest(author="John Doe  ;  Jane Smith  ;  Bob Jones")
+        assert manifest.authors == ["John Doe", "Jane Smith", "Bob Jones"]
+
     def test_default_start_canvas(self):
         image_server = ImageServerFactory.create(server_base="https://fake.info")
         manifest = Manifest(image_server=image_server)

apps/readux/forms.py

@@ -52,6 +52,12 @@ def valid_value(self, value):
 class ManifestSearchForm(forms.Form):
     """Django form for searching Manifests via Elasticsearch"""
 
+    PER_PAGE_CHOICES = [
+        ("20", "20"),
+        ("40", "40"),
+        ("60", "60"),
+        ("100", "100"),
+    ]
     q = forms.CharField(
         label="Search for individual whole keywords. Multiple words will be searched as 'or' (e.g. Rome London = Rome or London).",
         required=False,
@@ -73,11 +79,7 @@ class ManifestSearchForm(forms.Form):
             ("metadata", "Metadata only"),
             ("text", "Textual contents only"),
         ),
-        widget=forms.Select(
-            attrs={
-                "class": "uk-select",
-            },
-        ),
+        widget=forms.Select(attrs={"class": "uk-select"}),
     )
     language = FacetedMultipleChoiceField(
         label="Language",
@@ -121,9 +123,32 @@ class ManifestSearchForm(forms.Form):
             ("-label_alphabetical", "Title (Z-A)"),
             ("_score", "Relevance"),
         ),
+        widget=forms.Select(attrs={"class": "uk-select"}),
+    )
+    display = forms.ChoiceField(
+        label="View mode",
+        required=False,
+        choices=(
+            ("list", "List view"),
+            ("grid", "Grid view"),
+        ),
+        initial="list",
         widget=forms.Select(
             attrs={
                 "class": "uk-select",
+                "aria-label": "Select view mode",
+            },
+        ),
+    )
+    per_page = forms.ChoiceField(
+        label="Items per page",
+        required=False,
+        choices=PER_PAGE_CHOICES,
+        initial="60",
+        widget=forms.Select(
+            attrs={
+                "class": "uk-select",
+                "aria-label": "Items per page",
             },
         ),
     )
@@ -222,6 +247,12 @@ class AllVolumesForm(forms.Form):
         ("asc", "Ascending"),
         ("desc", "Descending"),
     ]
+    PER_PAGE_CHOICES = [
+        ("20", "20"),
+        ("40", "40"),
+        ("60", "60"),
+        ("100", "100"),
+    ]
     sort = forms.ChoiceField(
         label="Sort by",
         choices=SORT_CHOICES,
@@ -234,6 +265,13 @@ class AllVolumesForm(forms.Form):
         required=False,
         widget=CustomDropdownSelect,
     )
+    per_page = forms.ChoiceField(
+        label="Items per page",
+        choices=PER_PAGE_CHOICES,
+        required=False,
+        initial="60",
+        widget=CustomDropdownSelect,
+    )
 
 
 class AllCollectionsForm(forms.Form):
@@ -248,6 +286,12 @@ class AllCollectionsForm(forms.Form):
         ("asc", "Ascending"),
         ("desc", "Descending"),
     ]
+    PER_PAGE_CHOICES = [
+        ("20", "20"),
+        ("40", "40"),
+        ("60", "60"),
+        ("100", "100"),
+    ]
     sort = forms.ChoiceField(
         label="Sort by",
         choices=SORT_CHOICES,
@@ -260,3 +304,10 @@ class AllCollectionsForm(forms.Form):
         required=False,
         widget=CustomDropdownSelect,
     )
+    per_page = forms.ChoiceField(
+        label="Items per page",
+        choices=PER_PAGE_CHOICES,
+        required=False,
+        initial="60",
+        widget=CustomDropdownSelect,
+    )

apps/readux/templatetags/readux_extras.py

@@ -19,6 +19,42 @@ def dict_item(dictionary, key):
         return None
 
 
+@register.filter
+def attr(obj, attr_name):
+    """Safely access an attribute on an object without raising if missing."""
+    try:
+        return getattr(obj, attr_name)
+    except AttributeError:
+        return None
+
+
+@register.filter
+def manifest_year(volume):
+    """Return a 4-digit published year from a manifest or hit object."""
+    # try standard published_date first
+    published = getattr(volume, "published_date", None)
+    if published:
+        # handle datetime/date objects with a year attribute
+        year = getattr(published, "year", None)
+        if year:
+            return f"{int(year):04d}"
+        # fall back to parsing string content
+        match = re.search(r"\d{4}", str(published))
+        if match:
+            return match.group(0)
+        return str(published)[:4]
+
+    # fall back to elasticsearch stored string (may be missing on some hits)
+    edtf = getattr(volume, "published_date_edtf", None)
+    if edtf:
+        match = re.search(r"\d{4}", str(edtf))
+        if match:
+            return match.group(0)
+        return str(edtf)[:4]
+
+    return ""
+
+
 @register.filter
 def has_inner_hits(volume):
     """Template filter to determine if there are any inner hits across the volume"""
@@ -84,3 +120,21 @@ def vimeo_embed_url(vimeo_url):
     # get the embed url from a vimeo link
     # i.e. https://vimeo.com/76979871 --> https://player.vimeo.com/video/76979871
     return re.sub(r"vimeo\.com\/(\d+)", r"player.vimeo.com/video/\1", vimeo_url)
+
+
+@register.filter
+def spaced_semicolons(value):
+    """Ensure a single space follows each semicolon in a metadata string."""
+    try:
+        return re.sub(r";\s*", "; ", str(value))
+    except TypeError:
+        return value
+
+
+@register.filter
+def strip_trailing_commas(value):
+    """Remove any trailing commas and surrounding whitespace."""
+    try:
+        return re.sub(r",\s*$", "", str(value))
+    except TypeError:
+        return value