[Koha-cvs] CVS: koha/html-template search.pl,1.14,1.15

[Steve Tonnesen]

Update of /cvsroot/koha/koha/html-template
In directory usw-pr-cvs1:/tmp/cvs-serv3066/html-template

Modified Files:
	search.pl 
Log Message:
Darn.  Committed over old search.pl... really going to have to learn how to
roll back files.  ;)


Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/html-template/search.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** search.pl	14 May 2002 23:13:24 -0000	1.14
--- search.pl	15 May 2002 04:16:37 -0000	1.15
***************
*** 41,45 ****
  my $subject=$query->param('subject');
  # if its a subject we need to use the subject.tmpl
! $templatebase=~ s/searchresults\.tmpl/subject\.tmpl/;
  
  my $template = HTML::Template->new(filename => "$includes/templates/$theme/$templatebase", die_on_bad_params => 0, path => [$includes]);
--- 41,48 ----
  my $subject=$query->param('subject');
  # if its a subject we need to use the subject.tmpl
! if ($subject) {
!     $templatebase=~ s/searchresults\.tmpl/subject\.tmpl/;
!     $theme=picktemplate($includes, $templatebase);
! }
  
  my $template = HTML::Template->new(filename => "$includes/templates/$theme/$templatebase", die_on_bad_params => 0, path => [$includes]);
***************
*** 76,80 ****
--- 79,98 ----
  $search{'ttype'}=$ttype;
  
+ my $forminputs;
+ ($keyword) && (push @$forminputs, { line => "keyword=$keyword"});
+ ($subject) && (push @$forminputs, { line => "subject=$subject"});
+ ($author) && (push @$forminputs, { line => "author=$author"});
+ ($illustrator) && (push @$forminputs, { line => "illustrator=$illustrator"});
+ ($itemnumber) && (push @$forminputs, { line => "itemnumber=$itemnumber"});
+ ($isbn) && (push @$forminputs, { line => "isbn=$isbn"});
+ ($datebefore) && (push @$forminputs, { line => "date-before=$datebefore"});
+ ($class) && (push @$forminputs, { line => "class=$class"});
+ ($dewey) && (push @$forminputs, { line => "dewey=$dewey"});
+ ($branch) && (push @$forminputs, { line => "branch=$branch"});
+ ($title) && (push @$forminputs, { line => "title=$title"});
+ ($ttype) && (push @$forminputs, { line => "ttype=$ttype"});
+ $template->param(FORMINPUTS => $forminputs);
  # whats this for?
+ # I think it is (or was) a search from the "front" page...   [st]
  $search{'front'}=$query->param('front');