fix for #614

[koha.git] / detail.pl

diff --git a/detail.pl b/detail.pl
index 324bd1b..82d57e2 100755 (executable)
--- a/detail.pl
+++ b/detail.pl
@@ -1,46 +1,56 @@
 #!/usr/bin/perl
+# NOTE: Use standard 8-space tabs for this file (indents are 4 spaces)
+
+# Copyright 2000-2002 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::Database;
-use C4::Output;  # contains picktemplate
+use C4::Context;
+use C4::Output;  # contains gettemplate
 use CGI;
 use C4::Search;
- 
-my $query=new CGI;
-
+use C4::Auth;
+use C4::Interface::CGI::Output;
+use C4::Date;
 
-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 $query=new CGI;
+my $type=$query->param('type');
+($type) || ($type='intra');
 
 my $biblionumber=$query->param('bib');
-my $type='intra';
 
 # change back when ive fixed request.pl
 my @items = ItemInfo(undef, $biblionumber, $type);
+my $norequests = 1;
+foreach my $itm (@items) {
+     $norequests = 0 unless $itm->{'notforloan'};
+}
+
+
+
 my $dat=bibdata($biblionumber);
 my ($authorcount, $addauthor)= &addauthor($biblionumber);
 my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
 my ($websitecount, @websites)             = &getwebsites($biblionumber);
 
 $dat->{'count'}=@items;
+$dat->{'norequests'} = $norequests;
 
 $dat->{'additional'}=$addauthor->[0]->{'author'};
 for (my $i = 1; $i < $authorcount; $i++) {
@@ -56,33 +66,40 @@ my $itemsarray=\@items;
 my $webarray=\@webbiblioitems;
 my $sitearray=\@websites;
 
-my $includes=$configfile{'includes'};
-($includes) || ($includes="/usr/local/www/hdl/htdocs/includes");
-my $templatebase="catalogue/detail.tmpl";
 my $startfrom=$query->param('startfrom');
 ($startfrom) || ($startfrom=0);
-my $theme=picktemplate($includes, $templatebase);
 
-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   => ($type eq 'opac'? 'catalogue/detail-opac.tmpl':
+                                            'catalogue/detail.tmpl'),
+       query           => $query,
+       type            => "intranet",
+       authnotrequired => ($type eq 'opac'),
+       flagsrequired   => {catalogue => 1},
+    });
 
 my $count=1;
 
 # now to get the items into a hash we can use and whack that thru
 
 
-$template->param(startfrom => $startfrom+1);
-$template->param(endat => $startfrom+20);
-$template->param(numrecords => $count);
 my $nextstartfrom=($startfrom+20<$count-20) ? ($startfrom+20) : ($count-20);
 my $prevstartfrom=($startfrom-20>0) ? ($startfrom-20) : (0);
-$template->param(nextstartfrom => $nextstartfrom);
-$template->param(prevstartfrom => $prevstartfrom);
-# $template->param(template => $templatename);
-# $template->param(search => $search);
-$template->param(includesdir => $includes);
-$template->param(BIBLIO_RESULTS => $resultsarray);
-$template->param(ITEM_RESULTS => $itemsarray);
-$template->param(WEB_RESULTS => $webarray);
-$template->param(SITE_RESULTS => $sitearray);
-print "Content-Type: text/html\n\n", $template->output;
-
+$template->param(startfrom => $startfrom+1,
+                                               endat => $startfrom+20,
+                                               numrecords => $count,
+                                               nextstartfrom => $nextstartfrom,
+                                               prevstartfrom => $prevstartfrom,
+                                               BIBLIO_RESULTS => $resultsarray,
+                                               ITEM_RESULTS => $itemsarray,
+                                               WEB_RESULTS => $webarray,
+                                               SITE_RESULTS => $sitearray,
+                                               loggedinuser => $loggedinuser,
+                                               biblionumber => $biblionumber);
+
+output_html_with_http_headers $query, $cookie, $template->output;
+
+
+# Local Variables:
+# tab-width: 8
+# End: