X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=catalogue%2Fmoredetail.pl;h=e8736ff398d1f4184176920c8eac86f557b03059;hb=refs%2Fheads%2Fkoha_ffzg;hp=70378d0268b9cb73c7ab243aa30d8b050fa4bc7a;hpb=30667f05551125fea51426724866afc8440af373;p=koha.git diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl index 70378d0268..e8736ff398 100755 --- a/catalogue/moredetail.pl +++ b/catalogue/moredetail.pl @@ -19,37 +19,30 @@ # along with Koha; if not, see . -use strict; -#use warnings; FIXME - Bug 2505 +use Modern::Perl; use C4::Koha; use CGI qw ( -utf8 ); +use HTML::Entities; use C4::Biblio; use C4::Items; -use C4::Branch; use C4::Acquisition; use C4::Output; use C4::Auth; use C4::Serials; -use C4::Circulation; # to use itemissues -use C4::Members; # to use GetMember use C4::Search; # enabled_staff_search_views -use C4::Members qw/GetHideLostItemsPreference/; -use C4::Reserves qw(GetReservesFromBiblionumber); -use Koha::Acquisition::Bookseller; +use Koha::Acquisition::Booksellers; +use Koha::AuthorisedValues; +use Koha::Biblios; use Koha::DateUtils; +use Koha::Items; +use Koha::Patrons; my $query=new CGI; -# FIXME subject is not exported to the template? -my $subject=$query->param('subject'); - -# if its a subject we need to use the subject.tt my ($template, $loggedinuser, $cookie) = get_template_and_user( { - template_name => ( $subject - ? 'catalogue/subject.tt' - : 'catalogue/moredetail.tt'), + template_name => 'catalogue/moredetail.tt', query => $query, type => "intranet", authnotrequired => 0, @@ -58,20 +51,19 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user( ); if($query->cookie("holdfor")){ - my $holdfor_patron = GetMember('borrowernumber' => $query->cookie("holdfor")); + my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") ); $template->param( holdfor => $query->cookie("holdfor"), - holdfor_surname => $holdfor_patron->{'surname'}, - holdfor_firstname => $holdfor_patron->{'firstname'}, - holdfor_cardnumber => $holdfor_patron->{'cardnumber'}, + holdfor_surname => $holdfor_patron->surname, + holdfor_firstname => $holdfor_patron->firstname, + holdfor_cardnumber => $holdfor_patron->cardnumber, ); } -my $hidepatronname = C4::Context->preference("HidePatronName"); - # get variables my $biblionumber=$query->param('biblionumber'); +$biblionumber = HTML::Entities::encode($biblionumber); my $title=$query->param('title'); my $bi=$query->param('bi'); $bi = $biblionumber unless $bi; @@ -97,14 +89,18 @@ my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber); my $fw = GetFrameworkCode($biblionumber); my @all_items= GetItemsInfo($biblionumber); my @items; +my $patron = Koha::Patrons->find( $loggedinuser ); for my $itm (@all_items) { push @items, $itm unless ( $itm->{itemlost} && - GetHideLostItemsPreference($loggedinuser) && + $patron->category->hidelostitems && !$showallitems && ($itemnumber != $itm->{itemnumber})); } -my $record=GetMarcBiblio($biblionumber); +my $record=GetMarcBiblio({ biblionumber => $biblionumber }); + +output_and_exit( $query, $cookie, $template, 'unknown_biblio') + unless $record; my $hostrecords; # adding items linked via host biblios @@ -123,23 +119,25 @@ $data->{'count'}=$totalcount; $data->{'showncount'}=$showncount; $data->{'hiddencount'}=$hiddencount; # can be zero -my $ccodes= GetKohaAuthorisedValues('items.ccode',$fw); -my $copynumbers = GetKohaAuthorisedValues('items.copynumber',$fw); -my $itemtypes = GetItemTypes; +my $ccodes = + { map { $_->{authorised_value} => $_->{lib} } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => $fw, kohafield => 'items.ccode' } ) }; +my $copynumbers = + { map { $_->{authorised_value} => $_->{lib} } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => $fw, kohafield => 'items.copynumber' } ) }; -$data->{'itemtypename'} = $itemtypes->{$data->{'itemtype'}}->{'translated_description'}; -$data->{'rentalcharge'} = sprintf( "%.2f", $data->{'rentalcharge'} ); +my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } }; + +$data->{'itemtypename'} = $itemtypes->{ $data->{'itemtype'} }->{'translated_description'} + if $data->{itemtype} && exists $itemtypes->{ $data->{itemtype} }; foreach ( keys %{$data} ) { $template->param( "$_" => defined $data->{$_} ? $data->{$_} : '' ); } ($itemnumber) and @items = (grep {$_->{'itemnumber'} == $itemnumber} @items); foreach my $item (@items){ - $item->{itemlostloop}= GetAuthorisedValues(GetAuthValCode('items.itemlost',$fw),$item->{itemlost}) if GetAuthValCode('items.itemlost',$fw); - $item->{itemdamagedloop}= GetAuthorisedValues(GetAuthValCode('items.damaged',$fw),$item->{damaged}) if GetAuthValCode('items.damaged',$fw); - $item->{'collection'} = $ccodes->{ $item->{ccode} } if ($ccodes); - $item->{'itype'} = $itemtypes->{ $item->{'itype'} }->{'translated_description'}; - $item->{'replacementprice'} = sprintf( "%.2f", $item->{'replacementprice'} ); + $item->{object} = Koha::Items->find( $item->{itemnumber} ); + $item->{'collection'} = $ccodes->{ $item->{ccode} } if $ccodes && $item->{ccode} && exists $ccodes->{ $item->{ccode} }; + $item->{'itype'} = $itemtypes->{ $item->{'itype'} }->{'translated_description'} if exists $itemtypes->{ $item->{'itype'} }; + $item->{'replacementprice'} = $item->{'replacementprice'}; if ( defined $item->{'copynumber'} ) { $item->{'displaycopy'} = 1; if ( defined $copynumbers->{ $item->{'copynumber'} } ) { @@ -162,8 +160,8 @@ foreach my $item (@items){ $item->{'orderdate'} = $order->{'entrydate'}; if ($item->{'basketno'}){ my $basket = GetBasket($item->{'basketno'}); - my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $basket->{booksellerid} }); - $item->{'vendor'} = $bookseller->{'name'}; + my $bookseller = Koha::Acquisition::Booksellers->find( $basket->{booksellerid} ); + $item->{'vendor'} = $bookseller->name; } $item->{'invoiceid'} = $order->{'invoiceid'}; if($item->{invoiceid}) { @@ -183,23 +181,31 @@ foreach my $item (@items){ $item->{'nomod'}=1; } } - $item->{'homebranchname'} = GetBranchName($item->{'homebranch'}); - $item->{'holdingbranchname'} = GetBranchName($item->{'holdingbranch'}); if ($item->{'datedue'}) { $item->{'issue'}= 1; } else { $item->{'issue'}= 0; } - unless ($hidepatronname) { - if ( $item->{'borrowernumber'} ) { - my $curr_borrower = GetMember('borrowernumber' => $item->{'borrowernumber'} ); - $item->{borrowerfirstname} = $curr_borrower->{'firstname'}; - $item->{borrowersurname} = $curr_borrower->{'surname'}; - } + if ( $item->{'borrowernumber'} ) { + my $curr_borrower = Koha::Patrons->find( $item->{borrowernumber} ); + $item->{patron} = $curr_borrower; } +} +my $mss = Koha::MarcSubfieldStructures->search({ frameworkcode => $fw, kohafield => 'items.itemlost', authorised_value => [ -and => {'!=' => undef }, {'!=' => ''}] }); +if ( $mss->count ) { + $template->param( itemlostloop => GetAuthorisedValues( $mss->next->authorised_value ) ); +} +$mss = Koha::MarcSubfieldStructures->search({ frameworkcode => $fw, kohafield => 'items.damaged', authorised_value => [ -and => {'!=' => undef }, {'!=' => ''}] }); +if ( $mss->count ) { + $template->param( itemdamagedloop => GetAuthorisedValues( $mss->next->authorised_value ) ); } +$mss = Koha::MarcSubfieldStructures->search({ frameworkcode => $fw, kohafield => 'items.withdrawn', authorised_value => [ -and => {'!=' => undef }, {'!=' => ''}] }); +if ( $mss->count ) { + $template->param( itemwithdrawnloop => GetAuthorisedValues( $mss->next->authorised_value) ); +} + $template->param(count => $data->{'count'}, subscriptionsnumber => $subscriptionsnumber, subscriptiontitle => $data->{title}, @@ -215,7 +221,6 @@ $template->param( itemnumber => $itemnumber, z3950_search_params => C4::Search::z3950_search_args(GetBiblioData($biblionumber)), subtitle => $subtitle, - hidepatronname => $hidepatronname, ); $template->param(ONLY_ONE => 1) if ( $itemnumber && $showncount != @items ); $template->{'VARS'}->{'searchid'} = $query->param('searchid'); @@ -248,9 +253,9 @@ $template->param (countorders => $count_orders_using_biblio); my $count_deletedorders_using_biblio = scalar @deletedorders_using_biblio ; $template->param (countdeletedorders => $count_deletedorders_using_biblio); -my $holds = GetReservesFromBiblionumber({ biblionumber => $biblionumber, all_dates => 1 }); -my $holdcount = scalar( @$holds ); -$template->param( holdcount => scalar ( @$holds ) ); +my $biblio = Koha::Biblios->find( $biblionumber ); +my $holds = $biblio->holds; +$template->param( holdcount => $holds->count ); output_html_with_http_headers $query, $cookie, $template->output;