Attachment 157404 Details for Bug 34014 – Bug 34014: (follow-up) Tidy

[patch] Bug 34014: (follow-up) Tidy

Bug-34014-follow-up-Tidy.patch (text/plain), 3.12 KB, created by Martin Renvoize (ashimema) on 2023-10-19 09:33:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2023-10-19 09:33:16 UTC

Size: 3.12 KB

patch

obsolete

>From 178d519ccab786ce0e1ce959f47358b9bf6ad905 Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Tue, 17 Oct 2023 18:13:32 +0000
>Subject: [PATCH] Bug 34014: (follow-up) Tidy
>
>Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
>Signed-off-by: Kelly McElligott <kelly@bywatersolutions.com>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> C4/Biblio.pm             |  4 ++--
> cataloguing/addbiblio.pl |  2 +-
> svc/bib                  | 12 ++++++------
> 3 files changed, 9 insertions(+), 9 deletions(-)
>
>diff --git a/C4/Biblio.pm b/C4/Biblio.pm
>index 8c562010f0f..eea56d7e4ca 100644
>--- a/C4/Biblio.pm
>+++ b/C4/Biblio.pm
>@@ -374,11 +374,11 @@ sub ModBiblio {
>         my $record;
>         my $decoding_error = "";
>         eval { $record = $biblio->metadata->record };
>-        if( $@ ){
>+        if ($@) {
>             my $exception = $@;
>             $exception->rethrow unless ( $exception->isa('Koha::Exceptions::Metadata::Invalid') );
>             $decoding_error = "There was an error with this bibliographic record: " . $exception;
>-            $record = $biblio->metadata->record_strip_nonxml;
>+            $record         = $biblio->metadata->record_strip_nonxml;
>         }
>         logaction( "CATALOGUING", "MODIFY", $biblionumber, "biblio $decoding_error BEFORE=>" . $record->as_formatted );
>     }
>diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
>index 7710e3f5c8c..a11711afd32 100755
>--- a/cataloguing/addbiblio.pl
>+++ b/cataloguing/addbiblio.pl
>@@ -578,7 +578,7 @@ my (
> 
> if ( $biblio && !$breedingid ) {
>     eval { $record = $biblio->metadata->record };
>-    if( $@ ){
>+    if ($@) {
>         my $exception = $@;
>         $exception->rethrow unless ( $exception->isa('Koha::Exceptions::Metadata::Invalid') );
>         $record = $biblio->metadata->record_strip_nonxml;
>diff --git a/svc/bib b/svc/bib
>index fc5996168d8..206778058b0 100755
>--- a/svc/bib
>+++ b/svc/bib
>@@ -70,18 +70,18 @@ sub fetch_bib {
>     my $record;
>     my $exception;
>     my $invalid_metadata;
>-    eval { $record = $biblio->metadata->record({ embed_items => scalar $query->param('items') }) };
>-    if( $@ ){
>+    eval { $record = $biblio->metadata->record( { embed_items => scalar $query->param('items') } ) };
>+    if ($@) {
>         $exception = $@;
>         $exception->rethrow unless ( $exception->isa('Koha::Exceptions::Metadata::Invalid') );
>-        $record = $biblio->metadata->record_strip_nonxml({ embed_items => scalar $query->param('items') });
>+        $record           = $biblio->metadata->record_strip_nonxml( { embed_items => scalar $query->param('items') } );
>         $invalid_metadata = 1;
>     }
>-    if  (defined $record) {
>-        print $query->header(-type => 'text/xml',-charset => 'utf-8', -invalid_metadata => $invalid_metadata );
>+    if ( defined $record ) {
>+        print $query->header( -type => 'text/xml', -charset => 'utf-8', -invalid_metadata => $invalid_metadata );
>         print $record->as_xml_record();
>     } else {
>-        print $query->header(-type => 'text/xml', -status => '404 Not Found');
>+        print $query->header( -type => 'text/xml', -status => '404 Not Found' );
>     }
> }
> 
>-- 
>2.41.0

Actions: View | Diff | Splinter Review

Attachments on bug 34014: 152360 | 157274 | 157275 | 157276 | 157277 | 157280 | 157401 | 157402 | 157403 | 157404 | 157405