From d3059ce5e888b8297664888ddfbe0ee302f466a5 Mon Sep 17 00:00:00 2001 From: oleonard Date: Thu, 13 Jan 2005 21:48:49 +0000 Subject: [PATCH] Adding option to output using quicksearch template if the quicksearch parameter is present (uses member-quicksearch.tmpl and member-quicksearch-results.tmpl) --- members/member.pl | 31 ++++++++++++++++++++++--------- members/members-home.pl | 18 +++++++++++++++++- 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/members/member.pl b/members/member.pl index 726b6b976a..82bbfc1fde 100755 --- a/members/member.pl +++ b/members/member.pl @@ -32,15 +32,19 @@ use C4::Search; use HTML::Template; my $input = new CGI; - -my $theme = $input->param('theme') || "default"; - # only used if allowthemeoverride is set -#my %tmpldata = pathtotemplate ( template => 'member.tmpl', theme => $theme, language => 'fi' ); - # FIXME - Error-checking -#my $template = HTML::Template->new( filename => $tmpldata{'path'}, -# die_on_bad_params => 0, -# loop_context_vars => 1 ); -my ($template, $loggedinuser, $cookie) +my $quicksearch = $input->param('quicksearch'); +my ($template, $loggedinuser, $cookie); +if($quicksearch){ + ($template, $loggedinuser, $cookie) + = get_template_and_user({template_name => "members/member-quicksearch-results.tmpl", + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => {borrowers => 1}, + debug => 1, + }); +} else { + ($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "members/member.tmpl", query => $input, type => "intranet", @@ -48,6 +52,15 @@ my ($template, $loggedinuser, $cookie) flagsrequired => {borrowers => 1}, debug => 1, }); +} +my $theme = $input->param('theme') || "default"; + # only used if allowthemeoverride is set +#my %tmpldata = pathtotemplate ( template => 'member.tmpl', theme => $theme, language => 'fi' ); + # FIXME - Error-checking +#my $template = HTML::Template->new( filename => $tmpldata{'path'}, +# die_on_bad_params => 0, +# loop_context_vars => 1 ); + my $member=$input->param('member'); $member =~ s/,//g; #remove any commas from search string diff --git a/members/members-home.pl b/members/members-home.pl index b2730e0fed..1a702b1e8e 100755 --- a/members/members-home.pl +++ b/members/members-home.pl @@ -9,7 +9,21 @@ use C4::Context; use HTML::Template; my $query = new CGI; -my ($template, $loggedinuser, $cookie) +my $quicksearch = $query->param('quicksearch'); +my ($template, $loggedinuser, $cookie); +my $template_name; + +if($quicksearch){ +($template, $loggedinuser, $cookie) + = get_template_and_user({template_name => "members/member-quicksearch.tmpl", + query => $query, + type => "intranet", + authnotrequired => 0, + flagsrequired => {borrowers => 1}, + debug => 1, + }); +} else { +($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "members/members-home.tmpl", query => $query, type => "intranet", @@ -17,5 +31,7 @@ my ($template, $loggedinuser, $cookie) flagsrequired => {borrowers => 1}, debug => 1, }); +} + output_html_with_http_headers $query, $cookie, $template->output; -- 2.39.2