Attachment 26500 Details for Bug 11213 – [SIGNED OFF] Bug 11213: whitespace correction

[patch] [SIGNED OFF] Bug 11213: whitespace correction

SIGNED-OFF-Bug-11213-whitespace-correction.patch (text/plain), 4.11 KB, created by Mark Tompsett on 2014-03-21 03:14:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Tompsett

Created: 2014-03-21 03:14:24 UTC

Size: 4.11 KB

patch

obsolete

>From 9ddf448868a91eb4a91e5e272432233796a1f8e8 Mon Sep 17 00:00:00 2001
>From: Srdjan <srdjan@catalyst.net.nz>
>Date: Tue, 18 Mar 2014 12:58:21 +1300
>Subject: [PATCH] [SIGNED OFF] Bug 11213: whitespace correction
>
>Not quite what I was expecting, but it is most of the whitespace
>changes
>
>Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
>---
> C4/Search.pm |   28 ++++++++++++++++------------
> 1 file changed, 16 insertions(+), 12 deletions(-)
>
>diff --git a/C4/Search.pm b/C4/Search.pm
>index 81e7709..87517fd 100644
>--- a/C4/Search.pm
>+++ b/C4/Search.pm
>@@ -1895,12 +1895,13 @@ sub searchResults {
>             my $userenv = C4::Context->userenv;
>             if ( $item->{onloan} && !(C4::Members::GetHideLostItemsPreference($userenv->{'number'}) && $item->{itemlost}) ) {
>                 $onloan_count++;
>-				my $key = $prefix . $item->{onloan} . $item->{barcode};
>+                my $key = $prefix . $item->{onloan} . $item->{barcode};
>                 $onloan_items->{$key} = { %$item };
>-				$onloan_items->{$key}->{due_date} = format_date($item->{onloan});
>-				$onloan_items->{$key}->{count}++ if $item->{$hbranch};
>-				$onloan_items->{$key}->{location} = $shelflocations->{ $item->{location} };
>-				$onloan_items->{$key}->{imageurl} = getitemtypeimagelocation( $search_context, $itemtypes{ $item->{itype} }->{imageurl} );
>+                $onloan_items->{$key}->{due_date} = format_date($item->{onloan});
>+                $onloan_items->{$key}->{count}++
>+                  if $item->{$hbranch};
>+                $onloan_items->{$key}->{location} = $shelflocations->{ $item->{location} };
>+                $onloan_items->{$key}->{imageurl} = getitemtypeimagelocation( $search_context, $itemtypes{ $item->{itype} }->{imageurl} );
>                 # if something's checked out and lost, mark it as 'long overdue'
>                 if ( $item->{itemlost} ) {
>                     $onloan_items->{$prefix}->{longoverdue}++;
>@@ -1980,19 +1981,22 @@ sub searchResults {
>                     $other_items->{$key} = { %$item };
>                     $other_items->{$key}->{intransit} = ( $transfertwhen ne '' ) ? 1 : 0;
>                     $other_items->{$key}->{onhold} = ($reservestatus) ? 1 : 0;
>-                    $other_items->{$key}->{notforloan} = GetAuthorisedValueDesc('','',$item->{notforloan},'','',$notforloan_authorised_value) if $notforloan_authorised_value and $item->{notforloan};
>-					$other_items->{$key}->{count}++ if $item->{$hbranch};
>-					$other_items->{$key}->{location} = $shelflocations->{ $item->{location} };
>-					$other_items->{$key}->{imageurl} = getitemtypeimagelocation( $search_context, $itemtypes{ $item->{itype} }->{imageurl} );
>+                    $other_items->{$key}->{notforloan} = GetAuthorisedValueDesc('','',$item->{notforloan},'','',$notforloan_authorised_value)
>+                      if $notforloan_authorised_value and $item->{notforloan};
>+                    $other_items->{$key}->{count}++
>+                      if $item->{$hbranch};
>+                    $other_items->{$key}->{location} = $shelflocations->{ $item->{location} };
>+                    $other_items->{$key}->{imageurl} = getitemtypeimagelocation( $search_context, $itemtypes{ $item->{itype} }->{imageurl} );
>                 }
>                 # item is available
>                 else {
>                     $can_place_holds = 1;
>                     $available_count++;
>                     $available_items->{$prefix} = { %$item };
>-					$available_items->{$prefix}->{count}++ if $item->{$hbranch};
>-					$available_items->{$prefix}->{location} = $shelflocations->{ $item->{location} };
>-					$available_items->{$prefix}->{imageurl} = getitemtypeimagelocation( $search_context, $itemtypes{ $item->{itype} }->{imageurl} );
>+                    $available_items->{$prefix}->{count}++
>+                      if $item->{$hbranch};
>+                    $available_items->{$prefix}->{location} = $shelflocations->{ $item->{location} };
>+                    $available_items->{$prefix}->{imageurl} = getitemtypeimagelocation( $search_context, $itemtypes{ $item->{itype} }->{imageurl} );
>                 }
>             }
>         }    # notforloan, item level and biblioitem level
>-- 
>1.7.9.5

Actions: View | Diff | Splinter Review

Attachments on bug 11213: 22800 | 26394 | 26430 | 26431 | 26499 | 26500 | 26695 | 26696 | 26713 | 26718 | 26719 | 26720 | 26721 | 29557 | 29558 | 29559 | 29560 | 29561 | 29562 | 29563 | 29564 | 38584 | 38585 | 38586 | 38587 | 38588 | 38589 | 38590 | 39023 | 39024 | 39025 | 39026 | 39027 | 39028 | 39029 | 42234 | 42235 | 42236 | 42237 | 42238 | 42239 | 42240 | 42425 | 49750 | 49751 | 49752 | 49753 | 49754 | 49755 | 50163 | 50164 | 50165 | 50166 | 50167 | 50168 | 54447 | 54448 | 54449 | 54450 | 54451 | 54452 | 57578 | 57579 | 57580 | 57581 | 57582 | 57583 | 62434 | 62435 | 62436 | 62437 | 62438 | 62439 | 68646 | 68818 | 68819 | 68820 | 68821 | 68822 | 68823