Attachment 135579 Details for Bug 29697 – Bug 29697: Deal with the degraded view in detail.pl

[patch] Bug 29697: Deal with the degraded view in detail.pl

Bug-29697-Deal-with-the-degraded-view-in-detailpl.patch (text/plain), 6.50 KB, created by Jonathan Druart on 2022-06-02 09:49:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2022-06-02 09:49:14 UTC

Size: 6.50 KB

patch

obsolete

>From da093621d1ed9ff9cb9ea622b2cd1ebf228dc4d1 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Fri, 18 Mar 2022 11:30:31 +0100
>Subject: [PATCH] Bug 29697: Deal with the degraded view in detail.pl
>
>In detail.pl we must provide a degraded view with an error message about
>invalid MARC::Record.
>We are then forced to reproduce the GetMarcBiblio behaviour and call
>StripNonXmlChars on the MARC::XML
>---
> C4/Biblio.pm        |  1 -
> catalogue/detail.pl | 41 +++++++++++++++++++++++------------------
> 2 files changed, 23 insertions(+), 19 deletions(-)
>
>diff --git a/C4/Biblio.pm b/C4/Biblio.pm
>index 9647071f7ce..632c34e49a9 100644
>--- a/C4/Biblio.pm
>+++ b/C4/Biblio.pm
>@@ -95,7 +95,6 @@ use C4::Charset qw(
>     nsb_clean
>     SetMarcUnicodeFlag
>     SetUTF8Flag
>-    StripNonXmlChars
> );
> use C4::Linker;
> use C4::OAI::Sets;
>diff --git a/catalogue/detail.pl b/catalogue/detail.pl
>index ef4c801f9d8..7840ec919ff 100755
>--- a/catalogue/detail.pl
>+++ b/catalogue/detail.pl
>@@ -86,10 +86,9 @@ my $biblionumber = $query->param('biblionumber');
> $biblionumber = HTML::Entities::encode($biblionumber);
> # FIXME Special case here
> my $biblio = Koha::Biblios->find( $biblionumber );
>-my $record = $biblio->metadata->record;
> $template->param( 'biblio', $biblio );
> 
>-if ( not defined $record ) {
>+unless ( $biblio ) {
>     # biblionumber invalid -> report and exit
>     $template->param( unknownbiblionumber => 1,
>                       biblionumber => $biblionumber );
>@@ -98,7 +97,16 @@ if ( not defined $record ) {
> }
> 
> my $marc_record = eval { $biblio->metadata->record };
>-$template->param( decoding_error => $@ );
>+my $invalid_marc_record = $@ || !$marc_record;
>+if ($invalid_marc_record) {
>+    $template->param( decoding_error => $@ );
>+    my $marc_xml = C4::Charset::StripNonXmlChars( $biblio->metadata->metadata );
>+
>+    $marc_record = eval {
>+        MARC::Record::new_from_xml( $marc_xml, 'UTF-8',
>+            C4::Context->preference('marcflavour') );
>+    };
>+}
> 
> if($query->cookie("holdfor")){
>     my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") );
>@@ -127,18 +135,15 @@ my $marcflavour  = C4::Context->preference("marcflavour");
> 
> $template->param( 'SpineLabelShowPrintOnBibDetails' => C4::Context->preference("SpineLabelShowPrintOnBibDetails") );
> 
>-# Catch the exception as Koha::Biblio::Metadata->record can explode if the MARCXML is invalid
>-# Do not propagate it as we already deal with it previously in this script
>-my $coins = eval { $biblio->get_coins };
>-$template->param( ocoins => $coins );
>+$template->param( ocoins => !$invalid_marc_record ? $biblio->get_coins : undef );
> 
> # some useful variables for enhanced content;
> # in each case, we're grabbing the first value we find in
> # the record and normalizing it
>-my $upc = GetNormalizedUPC($record,$marcflavour);
>-my $ean = GetNormalizedEAN($record,$marcflavour);
>-my $oclc = GetNormalizedOCLCNumber($record,$marcflavour);
>-my $isbn = GetNormalizedISBN(undef,$record,$marcflavour);
>+my $upc = GetNormalizedUPC($marc_record,$marcflavour);
>+my $ean = GetNormalizedEAN($marc_record,$marcflavour);
>+my $oclc = GetNormalizedOCLCNumber($marc_record,$marcflavour);
>+my $isbn = GetNormalizedISBN(undef,$marc_record,$marcflavour);
> my $content_identifier_exists;
> if ( $isbn or $ean or $oclc or $upc ) {
>     $content_identifier_exists = 1;
>@@ -166,7 +171,7 @@ for my $itm (@all_items) {
> # flag indicating existence of at least one item linked via a host record
> my $hostrecords;
> # adding items linked via host biblios
>-my @hostitems = GetHostItemsInfo($record);
>+my @hostitems = GetHostItemsInfo($marc_record);
> if (@hostitems){
>     $hostrecords =1;
>     push (@items,@hostitems);
>@@ -204,7 +209,7 @@ foreach my $subscription (@subscriptions) {
> my $showcomp = C4::Context->preference('ShowComponentRecords');
> my $show_analytics;
> if ( $showcomp eq 'both' || $showcomp eq 'staff' ) {
>-    if ( my $components = $marc_record ? $biblio->get_marc_components(C4::Context->preference('MaxComponentRecords')) : undef ) {
>+    if ( my $components = !$invalid_marc_record ? $biblio->get_marc_components(C4::Context->preference('MaxComponentRecords')) : undef ) {
>         $show_analytics = 1 if @{$components}; # just show link when having results
>         $template->param( analytics_error => 1 ) if grep { $_->message eq 'component_search' } @{$biblio->object_messages};
>         my $parts;
>@@ -226,7 +231,7 @@ if ( $showcomp eq 'both' || $showcomp eq 'staff' ) {
>         $template->param( ComponentPartsQuery => $biblio->get_components_query );
>     }
> } else { # check if we should show analytics anyway
>-    $show_analytics = 1 if $marc_record && @{$biblio->get_marc_components(1)}; # count matters here, results does not
>+    $show_analytics = 1 if !$invalid_marc_record && @{$biblio->get_marc_components(1)}; # count matters here, results does not
>     $template->param( analytics_error => 1 ) if grep { $_->message eq 'component_search' } @{$biblio->object_messages};
> }
> 
>@@ -236,7 +241,7 @@ $template->param(
>     XSLTDetailsDisplay => '1',
>     XSLTBloc => XSLTParse4Display({
>         biblionumber   => $biblionumber,
>-        record         => $record,
>+        record         => $marc_record,
>         xsl_syspref    => "XSLTDetailsDisplay",
>         fix_amps       => 1,
>         xslt_variables => $xslt_variables,
>@@ -465,7 +470,7 @@ $template->param(
> );
> 
> $template->param(
>-    MARCNOTES   => $marc_record ? $biblio->get_marc_notes({ marcflavour => $marcflavour }) : undef,
>+    MARCNOTES   => !$invalid_marc_record ? $biblio->get_marc_notes({ marcflavour => $marcflavour }) : undef,
>     itemdata_ccode      => $itemfields{ccode},
>     itemdata_enumchron  => $itemfields{enumchron},
>     itemdata_uri        => $itemfields{uri},
>@@ -487,7 +492,7 @@ if (C4::Context->preference("AlternateHoldingsField") && scalar @items == 0) {
>     my $subfields = substr $fieldspec, 3;
>     my $holdingsep = C4::Context->preference("AlternateHoldingsSeparator") || ' ';
>     my @alternateholdingsinfo = ();
>-    my @holdingsfields = $record->field(substr $fieldspec, 0, 3);
>+    my @holdingsfields = $marc_record->field(substr $fieldspec, 0, 3);
> 
>     for my $field (@holdingsfields) {
>         my %holding = ( holding => '' );
>@@ -560,7 +565,7 @@ if ( C4::Context->preference("LocalCoverImages") == 1 ) {
> 
> # HTML5 Media
> if ( (C4::Context->preference("HTML5MediaEnabled") eq 'both') or (C4::Context->preference("HTML5MediaEnabled") eq 'staff') ) {
>-    $template->param( C4::HTML5Media->gethtml5media($record));
>+    $template->param( C4::HTML5Media->gethtml5media($marc_record));
> }
> 
> # Displaying tags
>-- 
>2.25.1

Actions: View | Diff | Splinter Review

Attachments on bug 29697: 129757 | 129758 | 129759 | 129760 | 129761 | 131868 | 131869 | 131870 | 131871 | 131872 | 131873 | 134066 | 134067 | 134068 | 134069 | 134070 | 134071 | 135574 | 135575 | 135576 | 135577 | 135578 | 135579 | 135580 | 135662 | 135663 | 135664 | 135665 | 135666 | 135667 | 135668 | 135669 | 135670 | 135671 | 135672 | 135673 | 135797 | 135798 | 135799 | 135800 | 135801 | 135802 | 135978 | 135979 | 135980 | 135981 | 135982 | 137835 | 137836 | 137837 | 137838 | 137839 | 137840 | 137894 | 137918 | 137919 | 137920 | 137921 | 137922 | 137923 | 137924 | 137948 | 138057 | 138076 | 138077 | 138078 | 138079 | 138080 | 138081 | 138089 | 138090 | 138804 | 139127 | 140007 | 140008