small bugfix

[koha_gimpoz] / moredetail.pl

diff --git a/moredetail.pl b/moredetail.pl
index 5757e0a..c89db96 100755 (executable)
--- a/moredetail.pl
+++ b/moredetail.pl
@@ -1,49 +1,50 @@
 #!/usr/bin/perl
+# NOTE: Use standard 8-space tabs for this file (indents are 4 spaces)
+
+# $Id$
+
+# Copyright 2000-2003 Katipo Communications
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# 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::Acquisitions;
-use C4::Output; # contains picktemplate
+use C4::Catalogue;
+use C4::Output; # contains gettemplate
+use C4::Auth;
+use C4::Interface::CGI::Output;
   
 my $query=new CGI;
 
-
-my $language='french';
-
-
-my %configfile;
-open (KC, "/etc/koha.conf");
-while (<KC>) {
- chomp;
- (next) if (/^\s*#/);
- if (/(.*)\s*=\s*(.*)/) {
-   my $variable=$1;
-   my $value=$2;
-   # Clean up white space at beginning and end
-   $variable=~s/^\s*//g;
-   $variable=~s/\s*$//g;
-   $value=~s/^\s*//g;
-   $value=~s/\s*$//g;
-   $configfile{$variable}=$value;
- }
-}
-
-my $includes=$configfile{'includes'};
-($includes) || ($includes="/usr/local/www/hdl/htdocs/includes");
-my $templatebase="catalogue/moredetail.tmpl";
-my $startfrom=$query->param('startfrom');
-($startfrom) || ($startfrom=0);
-my $theme=picktemplate($includes, $templatebase);
-
+# FIXME  subject is not exported to the template?
 my $subject=$query->param('subject');
+
 # if its a subject we need to use the subject.tmpl
-if ($subject){
-  $templatebase=~ s/searchresults\.tmpl/subject\.tmpl/;
-}
-my $template = HTML::Template->new(filename => "$includes/templates/$theme/$templatebase", die_on_bad_params => 0, path => [$includes]);
+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 
 
@@ -53,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;}
@@ -87,16 +89,24 @@ foreach my $item (@items){
     $item->{'timestamp0'}="$day/$mon/$year";
     $item->{'dateaccessioned'} = slashifyDate($item->{'dateaccessioned'});
     $item->{'datelastseen'} = slashifyDate($item->{'datelastseen'});
-    if ($item->{'date_due'} = 'Available'){
-       $item->{'issue'}="<b>Currently on issue to:</b><br>";
+    $item->{'ordernumber'} = $ordernum;
+    $item->{'booksellerinvoicenumber'} = $order->{'booksellerinvoicenumber'};
+
+    # 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: