From 525c7fe9812c727ffc8e6a9ab64cd32d95652855 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Mon, 10 Jul 2017 14:15:09 +0200 Subject: [PATCH] Bug 18921: Resolve a few warnings in C4/XSLT.pm Resolves warnings like: Use of uninitialized value in hash element at C4/XSLT.pm line 262. Use of uninitialized value in numeric eq (==) at C4/XSLT.pm line 267. Use of uninitialized value $status in concatenation (.) or string at C4/XSLT.pm line 300. Note: Line numbers are not exactly the same anymore. Test plan: [1] Enable XSLT view in OPAC [2] Without this patch, you will probably have some of these warnings when doing some opac searches. [3] Apply this patch. Check the logs again. Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- C4/XSLT.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/C4/XSLT.pm b/C4/XSLT.pm index 8813da0ac7..bf2647ab74 100644 --- a/C4/XSLT.pm +++ b/C4/XSLT.pm @@ -292,12 +292,12 @@ sub buildKohaItemsNamespace { my $reservestatus = C4::Reserves::GetReserveStatus( $item->{itemnumber} ); - if ( $itemtypes->{ $item->{itype} }->{notforloan} || $item->{notforloan} || $item->{onloan} || $item->{withdrawn} || $item->{itemlost} || $item->{damaged} || + if ( ( $item->{itype} && $itemtypes->{ $item->{itype} }->{notforloan} ) || $item->{notforloan} || $item->{onloan} || $item->{withdrawn} || $item->{itemlost} || $item->{damaged} || (defined $transfertwhen && $transfertwhen ne '') || $item->{itemnotforloan} || (defined $reservestatus && $reservestatus eq "Waiting") ){ if ( $item->{notforloan} < 0) { $status = "On order"; } - if ( $item->{itemnotforloan} > 0 || $item->{notforloan} > 0 || $itemtypes->{ $item->{itype} }->{notforloan} == 1 ) { + if ( $item->{itemnotforloan} && $item->{itemnotforloan} > 0 || $item->{notforloan} && $item->{notforloan} > 0 || $item->{itype} && $itemtypes->{ $item->{itype} }->{notforloan} && $itemtypes->{ $item->{itype} }->{notforloan} == 1 ) { $status = "reference"; } if ($item->{onloan}) { @@ -333,7 +333,7 @@ sub buildKohaItemsNamespace { . "$holdingbranch" . "$location" . "$ccode" - . "$status" + . "".( $status // q{} )."" . "$itemcallnumber" . "$stocknumber" . ""; -- 2.11.0