From 9316642a9e5aae651e1dd05f15f2e706d957ff2e Mon Sep 17 00:00:00 2001
From: vrigal <rigal@teklia.com>
Date: Tue, 3 Dec 2019 14:29:03 +0100
Subject: [PATCH] Compare lowercase structural metadata
---
arkindex/documents/api/search.py | 2 +-
arkindex/project/elastic.py | 2 +-
arkindex/project/tests/test_elastic.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arkindex/documents/api/search.py b/arkindex/documents/api/search.py
index fe72423bfe..afe0a847b2 100644
--- a/arkindex/documents/api/search.py
+++ b/arkindex/documents/api/search.py
@@ -56,7 +56,7 @@ class ElementSearch(SearchAPIView):
if structural_metadata:
search = search.filter(
'wildcard',
- structural_metadata='*{}*'.format(structural_metadata)
+ structural_metadata='*{}*'.format(structural_metadata.lower())
)
if element_type:
diff --git a/arkindex/project/elastic.py b/arkindex/project/elastic.py
index cd122035f5..faad6690ab 100644
--- a/arkindex/project/elastic.py
+++ b/arkindex/project/elastic.py
@@ -139,7 +139,7 @@ class ESElement(Document):
for element in Element.objects.get_ascending(instance.id)
],
structural_metadata=[
- md.value
+ md.value.lower()
for md in instance.metadatas.filter(type=MetaType.Structural)
],
transcriptions=list(map(
diff --git a/arkindex/project/tests/test_elastic.py b/arkindex/project/tests/test_elastic.py
index ef61d6ee3b..468a801f16 100644
--- a/arkindex/project/tests/test_elastic.py
+++ b/arkindex/project/tests/test_elastic.py
@@ -42,4 +42,4 @@ class TestESDocuments(FixtureAPITestCase):
element = self.corpus.elements.get(name='Volume 1')
element.metadatas.create(type=MetaType.Structural, name='ref.', value='123ABC')
es_document = ESElement.from_model(element)
- self.assertCountEqual(es_document.structural_metadata, ['123ABC'])
+ self.assertCountEqual(es_document.structural_metadata, ['123abc'])
--
GitLab