From ab351fdb42bcae228aa82e8f0655e4be3a231551 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Wed, 27 Feb 2019 07:09:12 -0300 Subject: [PATCH] Bug 22420: Remove wrong calculation on approved tags Before the patch from bug 14385, the passed structure (that is returned by get_approval_rows() looks like: \ [ [0] { approved 1, approved_by 51, approved_by_name undef, date_approved "2019-02-26 15:36:42", term "another", weight_total 3 }, [1] { ... After the introduced 'filtering', we loose the information about the term weight!: \ [ [0] { approved 1, author "Heylin, Clinton.", biblionumber 1, borrowernumber 51, date_created "2019-02-26 15:36:37", language undef, subtitle [], tag_id 1, term "word", time_created_display "15:36:37", title "E Street shuffle :", visible 1, XSLTBloc " <<>> ... The code even calls GetMarcBiblio. This needs to be reverted as it is plain wrong. If it was worth removing *some* biblios from the weight_total value, then this calculation should be done somewhere else, without fetching the MARC data again. Signed-off-by: Claudio Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 28bcc5aa68733e41d50a6a801088b06857968f42) Signed-off-by: Martin Renvoize --- opac/opac-tags.pl | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/opac/opac-tags.pl b/opac/opac-tags.pl index 272d896f23..d9c5add813 100755 --- a/opac/opac-tags.pl +++ b/opac/opac-tags.pl @@ -305,24 +305,6 @@ if ($add_op) { $arghash->{biblionumber} = $arg; } $results = get_approval_rows($arghash); - my @filtered_results; - foreach my $my_tag (@$my_tags) { - if (grep { $_->{term} eq $my_tag->{term} } @$results) { - if (! $my_tag->{visible} ) { - my $check_biblio = GetMarcBiblio({ - biblionumber => $my_tag->{biblionumber}, - embed_items => 1, - opac => 1, - borcat => $borcat }); - if ($check_biblio) { - push @filtered_results, $my_tag; - } - } else { - push @filtered_results, $my_tag; - } - } - } - $results = \@filtered_results; stratify_tags(10, $results); # work out the differents sizes for things my $count = scalar @$results; $template->param(TAGLOOP_COUNT => $count, mine => $mine); -- 2.39.5