X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=catalogue%2Fmoredetail.pl;h=6d6e572dd065514375d31c5a9ae0e9565374e9ef;hb=2afc052f64aef6cb31b016e7e3dfcfb4e3d0c596;hp=ac550ab9e005c1f166cfed2ab745902fea234344;hpb=3c6410111b2c07339c7e29b604faa9a44c1d4ee1;p=koha.git

diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl
index ac550ab9e0..6d6e572dd0 100755
--- a/catalogue/moredetail.pl
+++ b/catalogue/moredetail.pl
@@ -1,7 +1,4 @@
 #!/usr/bin/perl
-# NOTE: Use standard 8-space tabs for this file (indents are 4 spaces)
-
-# $Id$
 
 # Copyright 2000-2003 Katipo Communications
 #
@@ -20,17 +17,19 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-use HTML::Template;
+
 use strict;
-require Exporter;
 use C4::Koha;
 use CGI;
-use C4::Search;
+use C4::Biblio;
+use C4::Items;
+use C4::Branch;
 use C4::Acquisition;
-use C4::Output; # contains gettemplate
+use C4::Output;             # contains gettemplate
 use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Date;
+use C4::Serials;
+use C4::Dates qw/format_date/;
+use C4::Circulation;  # to use itemissues
 
 my $query=new CGI;
 
@@ -39,70 +38,95 @@ my $subject=$query->param('subject');
 
 # if its a subject we need to use the subject.tmpl
 my ($template, $loggedinuser, $cookie) = get_template_and_user({
-	template_name   => ($subject? 'catalogue/subject.tmpl':
-				      'catalogue/moredetail.tmpl'),
-	query           => $query,
-	type            => "intranet",
-	authnotrequired => 0,
-	flagsrequired   => {catalogue => 1},
+    template_name   => ($subject? 'catalogue/subject.tmpl':
+                      'catalogue/moredetail.tmpl'),
+    query           => $query,
+    type            => "intranet",
+    authnotrequired => 0,
+    flagsrequired   => {catalogue => 1},
     });
 
 # get variables
 
-my $biblionumber=$query->param('bib');
+my $biblionumber=$query->param('biblionumber');
 my $title=$query->param('title');
-my $bi=$query->param('bi');
-
-my $data=bibitemdata($bi);
+# my $bi=$query->param('bi');
+# $bi = $biblionumber unless $bi;
+my $data=GetBiblioData($biblionumber);
 my $dewey = $data->{'dewey'};
+
+#coping with subscriptions
+my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
+
 # 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 ($order,$ordernum)=GetOrder($bi,$biblionumber);
 
-my $env;
-$env->{itemcount}=1;
+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;
-
+($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}};
+    $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'};
+    $item->{'copyvol'} = $item->{'copynumber'};
+    if ($item->{notforloantext} or $item->{itemlost} or $item->{damaged} or $item->{wthdrawn}) {
+        $item->{status_advisory} = 1;
+    }
 
-    if ($item->{'date_due'} eq 'Available'){
-		$item->{'issue'}= 0;
+    if (C4::Context->preference("IndependantBranches")) {
+        #verifying rights
+        my $userenv = C4::Context->userenv();
+        unless (($userenv->{'flags'} == 1) or ($userenv->{'branch'} eq $item->{'homebranch'})) {
+                $item->{'nomod'}=1;
+        }
+    }
+    $item->{'homebranchname'} = GetBranchName($item->{'homebranch'});
+    $item->{'holdingbranchname'} = GetBranchName($item->{'holdingbranch'});
+    if ($item->{'datedue'}) {
+        $item->{'datedue'} = format_date($item->{'datedue'});
+        $item->{'issue'}= 1;
     } else {
-		$item->{'date_due'} = format_date($item->{'date_due'});
-		$item->{'issue'}= 1;
-		$item->{'borrowernumber'} = $item->{'borrower'};
-		$item->{'cardnumber'} = $item->{'card'};
+        $item->{'issue'}= 0;
     }
 }
-
+$template->param(count => $data->{'count'},
+	subscriptionsnumber => $subscriptionsnumber,
+    subscriptiontitle   => $data->{title},
+);
 $template->param(BIBITEM_DATA => \@results);
 $template->param(ITEM_DATA => \@items);
+$template->param(moredetailview => 1);
 $template->param(loggedinuser => $loggedinuser);
+$template->param(biblionumber => $biblionumber);
+$template->param(biblioitemnumber => $bi);
+$template->param(itemnumber => $itemnumber);
+$template->param(ONLY_ONE => 1) if ( $itemnumber && $count != @items );
 
 output_html_with_http_headers $query, $cookie, $template->output;
 
-
-# Local Variables:
-# tab-width: 8
-# End: