[Koha-cvs] CVS: koha/html-template search.pl,1.7,1.8

[Chris Cormack]

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

Modified Files:
	search.pl 
Log Message:
Will work now with the existing C4/Search.pm at least the one in the main
branch.
Will still break with the version in rel-1.2



Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/html-template/search.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** search.pl	10 May 2002 22:34:36 -0000	1.7
--- search.pl	13 May 2002 22:29:27 -0000	1.8
***************
*** 9,16 ****
  my $query=new CGI;
  
  my $templatename=$query->param('template');
  my $startfrom=$query->param('startfrom');
  ($startfrom) || ($startfrom=0);
! ($templatename) || ($templatename='searchresults.tmpl');
  
  
--- 9,20 ----
  my $query=new CGI;
  
+ # temporary variable for testing. Replace from /etc/koha.conf
+ 
+ my $templatedir="/usr/share/koha/intranet/htdocs/includes/templates";
+ 
  my $templatename=$query->param('template');
  my $startfrom=$query->param('startfrom');
  ($startfrom) || ($startfrom=0);
! ($templatename) || ($templatename="$templatedir/searchresults.tmpl");
  
  
***************
*** 32,37 ****
  $search{'keyword'}=$keyword;
  
! my ($count, $resultshash, @results) = &KeywordSearch(\$blah, 'intra', \%search, 20, $startfrom);
! 
  
  
--- 36,41 ----
  $search{'keyword'}=$keyword;
  
! my ($count, @results) = &KeywordSearch(\$blah, 'intra', \%search, 20, $startfrom);
! my $resultshash=\@results;