bugfix for bookseller forgot and minor sql improvement

[koha_fer] / moredetail.pl

diff --git a/moredetail.pl b/moredetail.pl
index 674f82f..c89db96 100755 (executable)
--- 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,17 +26,25 @@ require Exporter;
 use C4::Koha;
 use CGI;
 use C4::Search;
-use C4::Acquisitions;
+use C4::Catalogue;
 use C4::Output; # contains gettemplate
+use C4::Auth;
+use C4::Interface::CGI::Output;
   
 my $query=new CGI;
 
-my $includes = C4::Context->config('includes') ||
-       "/usr/local/www/hdl/htdocs/includes";
-my $startfrom=$query->param('startfrom') || 0;
-
+# 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 
 
@@ -43,6 +54,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 +72,6 @@ my $count=@items;
 $data->{'count'}=$count;
 my ($order,$ordernum)=getorder($bi,$biblionumber);
 
-
 my $env;
 $env->{itemcount}=1;
 
@@ -81,17 +92,21 @@ foreach my $item (@items){
     $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>";
     }
-         
 }
 
-$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: