X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=moredetail.pl;h=209be72c250d23c855f58b3dc201b890e487282f;hb=4487617448b12c6cd351b72f20666c0d5b0c4e20;hp=674f82f2b50b34c763ad5f20defafe16cb109987;hpb=d04d6cace7018d57184905d1ba3da97ec185f00e;p=koha.git

diff --git a/moredetail.pl b/moredetail.pl
index 674f82f2b5..209be72c25 100755
--- a/moredetail.pl
+++ b/moredetail.pl
@@ -1,6 +1,9 @@
 #!/usr/bin/perl
+# NOTE: Use standard 8-space tabs for this file (indents are 4 spaces)
 
-# Copyright 2000-2002 Katipo Communications
+# $Id$
+
+# Copyright 2000-2003 Katipo Communications
 #
 # This file is part of Koha.
 #
@@ -23,19 +26,28 @@ require Exporter;
 use C4::Koha;
 use CGI;
 use C4::Search;
-use C4::Acquisitions;
+use C4::Catalogue;
 use C4::Output; # contains gettemplate
-  
-my $query=new CGI;
+use C4::Auth;
+use C4::Interface::CGI::Output;
+use C4::Date;
 
-my $includes = C4::Context->config('includes') ||
-	"/usr/local/www/hdl/htdocs/includes";
-my $startfrom=$query->param('startfrom') || 0;
+my $query=new CGI;
 
+# FIXME  subject is not exported to the template?
+my $subject=$query->param('subject');
 
-my $template = gettemplate("catalogue/moredetail.tmpl");
+# 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},
+    });
 
-# get variables 
+# get variables
 
 my $biblionumber=$query->param('bib');
 my $title=$query->param('title');
@@ -43,6 +55,7 @@ my $bi=$query->param('bi');
 
 my $data=bibitemdata($bi);
 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;}
@@ -60,7 +73,6 @@ my $count=@items;
 $data->{'count'}=$count;
 my ($order,$ordernum)=getorder($bi,$biblionumber);
 
-
 my $env;
 $env->{itemcount}=1;
 
@@ -76,22 +88,26 @@ foreach my $item (@items){
     my $mon=substr($item->{'timestamp0'},4,2);
     my $day=substr($item->{'timestamp0'},6,2);
     $item->{'timestamp0'}="$day/$mon/$year";
-    $item->{'dateaccessioned'} = slashifyDate($item->{'dateaccessioned'});
-    $item->{'datelastseen'} = slashifyDate($item->{'datelastseen'});
+    $item->{'dateaccessioned'} = format_date($item->{'dateaccessioned'});
+    $item->{'datelastseen'} = format_date($item->{'datelastseen'});
     $item->{'ordernumber'} = $ordernum;
     $item->{'booksellerinvoicenumber'} = $order->{'booksellerinvoicenumber'};
 
-    # FIXME - This should be "==", not "=", right?
-    if ($item->{'date_due'} = 'Available'){
+    # FIXME untranslatable strings
+    if ($item->{'date_due'} eq 'Available'){
 	$item->{'issue'}="<b>Available</b><br>";
     } else {
-	$item->{'issue'}="<b>Currently on issue to:</b> <a href=/cgi-bin/koha/moremember.pl?bornum=$item->{'borrower0'}>$item->{'card'}</a><br>";
+	$item->{'issue'}="<b>Currently on issue to:</b> <a href=/cgi-bin/koha/moremember.pl?bornum=$item->{'borrower'}>$item->{'card'}</a><br>";
     }
-	  
 }
 
-$template->param(includesdir => $includes);
 $template->param(BIBITEM_DATA => \@results);
 $template->param(ITEM_DATA => \@items);
-print "Content-Type: text/html\n\n", $template->output;
+$template->param(loggedinuser => $loggedinuser);
+
+output_html_with_http_headers $query, $cookie, $template->output;
+
 
+# Local Variables:
+# tab-width: 8
+# End: