Attachment 165816 Details for Bug 35138 – Bug 35138: (QA followup) Tidy update

[patch] Bug 35138: (QA followup) Tidy update

Bug-35138-QA-followup-Tidy-update.patch (text/plain), 2.41 KB, created by Jonathan Druart on 2024-04-29 21:07:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2024-04-29 21:07:11 UTC

Size: 2.41 KB

patch

obsolete

>From 7522ca1d1dcfe044f66925e8ea3a06ed068ab16e Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Fri, 12 Apr 2024 09:03:46 +0000
>Subject: [PATCH] Bug 35138: (QA followup) Tidy update
>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>---
> .../data/mysql/atomicupdate/bug_35138.pl      | 23 +++++++++++--------
> 1 file changed, 14 insertions(+), 9 deletions(-)
>
>diff --git a/installer/data/mysql/atomicupdate/bug_35138.pl b/installer/data/mysql/atomicupdate/bug_35138.pl
>index 224a9b0aca8..27fb8a4e596 100755
>--- a/installer/data/mysql/atomicupdate/bug_35138.pl
>+++ b/installer/data/mysql/atomicupdate/bug_35138.pl
>@@ -16,33 +16,38 @@ return {
>             subject        => 'Topics',
>             ln             => 'Languages',
>         };
>+
>         # Do not update the label if different from the original one
>-        my $sth = $dbh->prepare(q{
>+        my $sth = $dbh->prepare(
>+            q{
>             UPDATE search_field
>             SET label = ?
>             WHERE name = ? AND label = ?
>-        });
>+        }
>+        );
>         while ( my ( $name, $label ) = each %$facets ) {
>             $sth->execute( $label, $name, $name );
>         }
> 
>-        $sth->execute( 'Collections', 'ccode', 'collection-code');
>+        $sth->execute( 'Collections', 'ccode', 'collection-code' );
> 
>         # Deal with DisplayLibraryFacets
>-        my ($DisplayLibraryFacets) = $dbh->selectrow_array(q{
>+        my ($DisplayLibraryFacets) = $dbh->selectrow_array(
>+            q{
>             SELECT value FROM systempreferences WHERE variable='DisplayLibraryFacets'
>-        });
>-        my ($homebranch, $holdingbranch);
>+        }
>+        );
>+        my ( $homebranch, $holdingbranch );
>         if ( $DisplayLibraryFacets eq 'both' ) {
>-            $homebranch = 1;
>+            $homebranch    = 1;
>             $holdingbranch = 1;
>         } elsif ( $DisplayLibraryFacets eq 'holding' ) {
>             $holdingbranch = 1;
>         } elsif ( $DisplayLibraryFacets eq 'home' ) {
>             $homebranch = 1;
>         }
>-        $sth->execute( 'Holding libraries', 'holdingbranch', 'holdinglibrary') if $holdingbranch;
>-        $sth->execute( 'Home libraries', 'homebranch', 'homelibrary') if $homebranch;
>+        $sth->execute( 'Holding libraries', 'holdingbranch', 'holdinglibrary' ) if $holdingbranch;
>+        $sth->execute( 'Home libraries',    'homebranch',    'homelibrary' )    if $homebranch;
> 
>     },
> };
>-- 
>2.34.1

Actions: View | Diff | Splinter Review

Attachments on bug 35138: 163133 | 163680 | 163681 | 163682 | 163683 | 163684 | 163896 | 163897 | 163898 | 163899 | 163900 | 164811 | 164812 | 164813 | 164814 | 164815 | 164816 | 165811 | 165812 | 165813 | 165814 | 165815 | 165816 | 165817 | 165818 | 166402