Adding value to tell getitemtypeimagesrc() where it was called from so that it return...

[koha.git] / catalogue / moredetail.pl

diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl
index d0c3fad..8b06517 100755 (executable)
--- a/catalogue/moredetail.pl
+++ b/catalogue/moredetail.pl
@@ -17,17 +17,18 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id$
 
 use strict;
 require Exporter;
 use C4::Koha;
 use CGI;
-use C4::Biblio;             # to use &GetBiblioItemData &GetItemsByBiblioitemnumber
+use C4::Biblio;
+use C4::Items;
+use C4::Branch;
 use C4::Acquisition;
 use C4::Output;             # contains gettemplate
 use C4::Auth;
-use C4::Date;
+use C4::Dates qw/format_date/;
 use C4::Circulation;  # to use itemissues
 
 my $query=new CGI;
@@ -49,9 +50,9 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({
 
 my $biblionumber=$query->param('biblionumber');
 my $title=$query->param('title');
-my $bi=$query->param('bi');
-$bi = $biblionumber unless $bi;
-my $data=GetBiblioItemData($bi);
+# my $bi=$query->param('bi');
+# $bi = $biblionumber unless $bi;
+my $data=GetBiblioData($biblionumber);
 my $dewey = $data->{'dewey'};
 
 # FIXME Dewey is a string, not a number, & we should use a function
@@ -66,37 +67,44 @@ my $dewey = $data->{'dewey'};
 # $data->{'dewey'}=$dewey;
 
 my @results;
-
-my $items= GetItemsByBiblioitemnumber($bi);
-my $count=@$items;
+my $fw = GetFrameworkCode($biblionumber);
+my @items= GetItemsInfo($biblionumber);
+my $count=@items;
 $data->{'count'}=$count;
 
-my $ordernum = GetOrderNumber($biblionumber,$bi);
+my $ordernum = GetOrderNumber($biblionumber);
 my $order = GetOrder($ordernum);
+my $ccodes= GetKohaAuthorisedValues('items.ccode',$fw);
+my $itemtypes = GetItemTypes;
 
+$data->{'itemtypename'} = $itemtypes->{$data->{'itemtype'}}->{'description'};
 $results[0]=$data;
-
-foreach my $item (@$items){
-       $item->{itemlostloop}= GetAuthorisedValues('ITEMLOST');
-       $item->{itemdamagedloop}= GetAuthorisedValues('DAMAGED');
+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}};
+    $item->{'itype'} = $itemtypes->{$item->{'itype'}}->{'description'}; 
     $item->{'replacementprice'}=sprintf("%.2f", $item->{'replacementprice'});
     $item->{'datelastborrowed'}= format_date($item->{'datelastborrowed'});
     $item->{'dateaccessioned'} = format_date($item->{'dateaccessioned'});
     $item->{'datelastseen'} = format_date($item->{'datelastseen'});
     $item->{'ordernumber'} = $ordernum;
     $item->{'booksellerinvoicenumber'} = $order->{'booksellerinvoicenumber'};
-
-    if ($item->{'date_due'} eq ''){
+    $item->{'homebranchname'} = GetBranchName($item->{'homebranch'});
+    $item->{'holdingbranchname'} = GetBranchName($item->{'holdingbranch'});
+    if ($item->{'onloan'} eq ''){
         $item->{'issue'}= 0;
     } else {
-        $item->{'date_due'} = format_date($item->{'date_due'});
+        $item->{'onloan'} = format_date($item->{'onloan'});
         $item->{'issue'}= 1;
     }
 }
-
+$template->param(count => $data->{'count'});
 $template->param(BIBITEM_DATA => \@results);
-$template->param(ITEM_DATA => $items);
+$template->param(ITEM_DATA => \@items);
+$template->param(moredetailview => 1);
 $template->param(loggedinuser => $loggedinuser);
+$template->param(biblionumber => $biblionumber);
 
 output_html_with_http_headers $query, $cookie, $template->output;