From c8baaca842292da2307f50d20d6c94b98dd8fd64 Mon Sep 17 00:00:00 2001 From: kpsherva Date: Mon, 17 Oct 2022 17:15:51 +0200 Subject: [PATCH 1/2] literature: add parentheses to search query * enforce logical precedence rules on search query, see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#_boolean_operators --- invenio_app_ils/literature/search.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/invenio_app_ils/literature/search.py b/invenio_app_ils/literature/search.py index 3e39dd3ac..eb860df11 100644 --- a/invenio_app_ils/literature/search.py +++ b/invenio_app_ils/literature/search.py @@ -31,7 +31,7 @@ def filter_serial_issues(search, query_string=None): if not strtobool(include_all): issue_query_string = "NOT document_type:SERIAL_ISSUE" if query_string: - query_string = "{} AND {}".format(query_string, issue_query_string) + query_string = "({}) AND ({})".format(query_string, issue_query_string) else: query_string = issue_query_string return search, query_string From c2aedd304000bf35533df11cfe6dcae23f184842 Mon Sep 17 00:00:00 2001 From: Karolina Przerwa Date: Tue, 18 Oct 2022 13:46:56 +0200 Subject: [PATCH 2/2] release: v1.0.0a69 --- CHANGES.rst | 4 ++++ invenio_app_ils/__init__.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 124fa3c1e..cbb4bc64f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -8,6 +8,10 @@ Changes ======= +Version 1.0.0a69 (released 2022-10-18) + +- adapt literature search query + Version 1.0.0a68 (released 2022-10-06) - bump pycountry diff --git a/invenio_app_ils/__init__.py b/invenio_app_ils/__init__.py index 5bf58f011..e53089d3e 100644 --- a/invenio_app_ils/__init__.py +++ b/invenio_app_ils/__init__.py @@ -7,6 +7,6 @@ """invenio-app-ils.""" -__version__ = '1.0.0a68' +__version__ = '1.0.0a69' __all__ = ("__version__",)