Attachment 140053 Details for Bug 25375 – Bug 25375: Fix 'available' facet in elasticsearch

[patch] Bug 25375: Fix 'available' facet in elasticsearch

Bug-25375-Fix-available-facet-in-elasticsearch.patch (text/plain), 4.13 KB, created by Joonas Kylmälä on 2022-09-01 18:00:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joonas Kylmälä

Created: 2022-09-01 18:00:26 UTC

Size: 4.13 KB

patch

obsolete

>From 174bde60d92042106f03d8167ad14b4955e5b674 Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Wed, 29 Apr 2020 16:13:08 +0200
>Subject: [PATCH] Bug 25375: Fix 'available' facet in elasticsearch
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Add a new boolean ES field named 'available', which is true if at least
>one item is available, which means the item is not on loan, not
>"notforloan", not withdrawn, not lost and not damaged
>
>A full indexation is required
>
>Test plan:
>1. Apply patch and run updatedatabase.pl
>2. Run `misc/search_tools/rebuild_elasticsearch.pl -d -b`
>3. Make sure you have some biblios whose items are all unavailable, some
>   biblios whose items are all available, and some biblios with at least
>   one item available and at least one item unavailable
>4. Use the 'available' filter on both opac and intranet and make sure it
>   works as expected.
>
>Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>
>Signed-off-by: Joonas KylmÃ¤lÃ¤ <joonas.kylmala@iki.fi>
>---
> Koha/SearchEngine/Elasticsearch.pm            | 20 +++++++++++++++++++
> .../Elasticsearch/QueryBuilder.pm             |  2 +-
> .../searchengine/elasticsearch/mappings.yaml  |  3 +++
> .../data/mysql/atomicupdate/bug-25375.perl    |  9 +++++++++
> 4 files changed, 33 insertions(+), 1 deletion(-)
> create mode 100644 installer/data/mysql/atomicupdate/bug-25375.perl
>
>diff --git a/Koha/SearchEngine/Elasticsearch.pm b/Koha/SearchEngine/Elasticsearch.pm
>index 6e36695409..38dd7321d5 100644
>--- a/Koha/SearchEngine/Elasticsearch.pm
>+++ b/Koha/SearchEngine/Elasticsearch.pm
>@@ -770,6 +770,26 @@ sub marc_records_to_documents {
>                 $record_document->{'marc_format'} = 'base64ISO2709';
>             }
>         }
>+
>+        # Check if there is at least one available item
>+        if ($self->index eq $BIBLIOS_INDEX) {
>+            my $biblio = Koha::Biblios->find($record->field('001')->data);
>+            my $items = $biblio->items;
>+            my $available = 0;
>+            while (my $item = $items->next) {
>+                next if $item->onloan;
>+                next if $item->notforloan;
>+                next if $item->withdrawn;
>+                next if $item->itemlost;
>+                next if $item->damaged;
>+
>+                $available = 1;
>+                last;
>+            }
>+
>+            $record_document->{available} = $available ? \1 : \0;
>+        }
>+
>         push @record_documents, $record_document;
>     }
>     return \@record_documents;
>diff --git a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm b/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
>index 27aabacd63..9679babc95 100644
>--- a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
>+++ b/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
>@@ -1102,7 +1102,7 @@ sub _fix_limit_special_cases {
>             }
>         }
>         elsif ( $l =~ /^available$/ ) {
>-            push @new_lim, 'onloan:false';
>+            push @new_lim, 'available:true';
>         }
>         else {
>             my ( $field, $term ) = $l =~ /^\s*([\w,-]*?):(.*)/;
>diff --git a/admin/searchengine/elasticsearch/mappings.yaml b/admin/searchengine/elasticsearch/mappings.yaml
>index 3eac85f09d..188b5975fd 100644
>--- a/admin/searchengine/elasticsearch/mappings.yaml
>+++ b/admin/searchengine/elasticsearch/mappings.yaml
>@@ -2551,6 +2551,9 @@ biblios:
>         sort: 0
>         suggestible: ''
>     type: boolean
>+  available:
>+    label: available
>+    type: boolean
>   other-control-number:
>     label: other-control-number
>     mappings:
>diff --git a/installer/data/mysql/atomicupdate/bug-25375.perl b/installer/data/mysql/atomicupdate/bug-25375.perl
>new file mode 100644
>index 0000000000..7de5ce51e7
>--- /dev/null
>+++ b/installer/data/mysql/atomicupdate/bug-25375.perl
>@@ -0,0 +1,9 @@
>+$DBversion = 'XXX';
>+if( CheckVersion( $DBversion ) ) {
>+    $dbh->do(qq{
>+        INSERT IGNORE INTO search_field (name, label, type)
>+        VALUES ('available', 'available', 'boolean')
>+    });
>+
>+    NewVersion( $DBversion, '25735', "Add Elasticsearch field 'available'");
>+}
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 25375: 104356 | 109647 | 109659 | 109660 | 109951 | 109952 | 109953 | 109954 | 131310 | 131311 | 131312 | 131313 | 132327 | 132328 | 132329 | 132330 | 138800 | 138802 | 138803 | 140053 | 140054 | 140055 | 140056 | 140057 | 140572 | 140899 | 140900 | 140979