X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=search.pl;h=75de430ce47d410b2d5f4deaef24f2a0d86d9628;hb=c431f61277bd3ab7fef6b4b4b0f498e52a3ea594;hp=f9dfc5f95b09e60cd33332575e7cfed7a51cd89f;hpb=0e7f86db7e08b23e7c2ec572b38b6eb94f206bda;p=koha.git

diff --git a/search.pl b/search.pl
index f9dfc5f95b..75de430ce4 100755
--- a/search.pl
+++ b/search.pl
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 
+# $Id$
 # Copyright 2000-2002 Katipo Communications
 #
 # This file is part of Koha.
@@ -17,6 +18,14 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
+# $Log$
+# Revision 1.32  2003/06/11 18:37:55  tonnesen
+# Using boolean_preference instead of preference for 'marc' setting
+#
+# Revision 1.31  2003/05/11 07:31:37  rangi
+# Removing duplicate use C4::Auth
+#
+
 use strict;
 require Exporter;
 use CGI;
@@ -24,8 +33,8 @@ use C4::Auth;
 use HTML::Template;
 use C4::Context;
 use C4::Search;
-use C4::Auth;
 use C4::Output;
+use C4::Interface::CGI::Output;
 
 my $query=new CGI;
 my $type=$query->param('type');
@@ -82,11 +91,11 @@ foreach my $term (qw(keyword subject author illustrator itemnumber
 		     publisher ttype))
 {
 	my $value = $query->param($term);
-
 	next unless defined $value && $value ne "";
 				# Skip blank search terms
 	$search{$term} = $value;
-	push @forminputs, { line => "$term=$value" };
+	push @forminputs, {	term => $term,
+							value =>$value };
 }
 
 $template->param(FORMINPUTS => \@forminputs);
@@ -168,7 +177,6 @@ $template->param(search => $search);
 $template->param(searchdesc => $searchdesc);
 $template->param(SEARCH_RESULTS => $resultsarray);
 #$template->param(includesdir => $includes);
-$template->param(loggedinuser => $loggedinuser);
 
 my @numbers = ();
 if ($count>10) {
@@ -192,12 +200,12 @@ if ($count>10) {
 }
 
 $template->param(numbers => \@numbers);
-if (C4::Context->preference('acquisitions') eq 'simple') {
+if (C4::Context->boolean_preference('marc') eq '1') {
 	$template->param(script => "MARCdetail.pl");
 } else {
 	$template->param(script => "detail.pl");
 }
 
 # Print the page
-print $query->header(-cookie => $cookie), $template->output;
+output_html_with_http_headers $query, $cookie, $template->output;