MARC search fixes and improvements. Now, ALL searches are indexed and should be very...

[koha_fer] / detail.pl

diff --git a/detail.pl b/detail.pl
index b94272d..0e00051 100755 (executable)
--- a/detail.pl
+++ b/detail.pl
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+# NOTE: Use standard 8-space tabs for this file (indents are 4 spaces)
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -21,19 +22,18 @@ use HTML::Template;
 use strict;
 require Exporter;
 use C4::Context;
-use C4::Output;  # contains picktemplate
+use C4::Output;  # contains gettemplate
 use CGI;
 use C4::Search;
 use C4::Auth;
+use C4::Interface::CGI::Output;
 
 my $query=new CGI;
 my $type=$query->param('type');
-(-e "opac") && ($type='opac');
 ($type) || ($type='intra');
-my ($loggedinuser, $cookie, $sessionID) = checkauth($query, ($type eq 'opac') ? (1) : (0));
 
 my $biblionumber=$query->param('bib');
-my $type='intra';
+#my $type='intra';     # FIXME - There's already a $type in this scope
 
 
 # change back when ive fixed request.pl
@@ -70,12 +70,15 @@ my $sitearray=\@websites;
 my $startfrom=$query->param('startfrom');
 ($startfrom) || ($startfrom=0);
 
-my $template;
-if ($type='opac') {
-       $template = gettemplate("catalogue/detail-opac.tmpl");
-} else {
-       $template=gettemplate("catalogue/detail.tmpl");
-}
+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
@@ -93,5 +96,9 @@ $template->param(ITEM_RESULTS => $itemsarray);
 $template->param(WEB_RESULTS => $webarray);
 $template->param(SITE_RESULTS => $sitearray);
 $template->param(loggedinuser => $loggedinuser);
-print $query->header(-cookie => $cookie), $template->output;
+output_html_with_http_headers $query, $cookie, $template->output;
+
 
+# Local Variables:
+# tab-width: 8
+# End: