removing image links

[koha.git] / search.pl

diff --git a/search.pl b/search.pl
index 04a5b18..d5a7ab8 100755 (executable)
--- a/search.pl
+++ b/search.pl
@@ -26,7 +26,7 @@ use C4::Context;
 use C4::Search;
 use C4::Auth;
 use C4::Output;
-use C4::Charset;
+use C4::Interface::CGI::Output;
 
 my $query=new CGI;
 my $type=$query->param('type');
@@ -83,11 +83,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);
@@ -169,7 +169,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) {
@@ -193,15 +192,12 @@ if ($count>10) {
 }
 
 $template->param(numbers => \@numbers);
-if (C4::Context->preference('acquisitions') eq 'simple') {
+if (C4::Context->preference('marc') eq 'on') {
        $template->param(script => "MARCdetail.pl");
 } else {
        $template->param(script => "detail.pl");
 }
 
 # Print the page
-print $query->header(
-    -type => guesstype($template->output),
-    -cookie => $cookie
-), $template->output;
+output_html_with_http_headers $query, $cookie, $template->output;