X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=catalogue%2Fmoredetail.pl;h=9c390d0a1e8fae10e983b2c099fcfa319223d5f9;hb=c938a23bb9bd891bfd076f48db614137614de809;hp=71d8a2d1f72d848423b983bd9c3d8deaad0aa421;hpb=7bd99ef3657c02a60e9880a3aabb1883d50779b0;p=koha_fer

diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl
index 71d8a2d1f7..9c390d0a1e 100755
--- a/catalogue/moredetail.pl
+++ b/catalogue/moredetail.pl
@@ -17,18 +17,16 @@
 # 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 &itemissues
+use C4::Biblio;             # to use &GetBiblioItemData &GetItemsByBiblioitemnumber
 use C4::Acquisition;
 use C4::Output;             # contains gettemplate
 use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Date;
+use C4::Dates qw/format_date/;
 use C4::Circulation;  # to use itemissues
 
 my $query=new CGI;
@@ -50,53 +48,59 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({
 
 my $biblionumber=$query->param('biblionumber');
 my $title=$query->param('title');
-my $bi=$query->param('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
-$dewey =~ s/0+$//;
-if ($dewey eq "000.") { $dewey = "";};
-if ($dewey < 10){$dewey='00'.$dewey;}
-if ($dewey < 100 && $dewey > 10){$dewey='0'.$dewey;}
-if ($dewey <= 0){
-      $dewey='';
-}
-$dewey=~ s/\.$//;
-$data->{'dewey'}=$dewey;
+# $dewey =~ s/0+$//;
+# if ($dewey eq "000.") { $dewey = "";};
+# if ($dewey < 10){$dewey='00'.$dewey;}
+# if ($dewey < 100 && $dewey > 10){$dewey='0'.$dewey;}
+# if ($dewey <= 0){
+#      $dewey='';
+# }
+# $dewey=~ s/\.$//;
+# $data->{'dewey'}=$dewey;
 
 my @results;
-
-my (@items)= itemissues($bi);
+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;
 $results[0]=$data;
-
 foreach my $item (@items){
-    $item->{'replacementprice'}=sprintf("%.2f", $item->{'replacementprice'});
+	$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 'Available'){
+    if ($item->{'date_due'} eq ''){
         $item->{'issue'}= 0;
     } else {
         $item->{'date_due'} = format_date($item->{'date_due'});
         $item->{'issue'}= 1;
-        $item->{'borrowernumber'} = $item->{'borrower'};
-        $item->{'cardnumber'} = $item->{'card'};
     }
 }
 
+$template->param(count => $data->{'count'});
 $template->param(BIBITEM_DATA => \@results);
 $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;