[Koha-cvs] CVS: koha/html-template search.pl,1.9,1.10

[Steve Tonnesen]

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

Modified Files:
	search.pl 
Log Message:
Modifications to use new template directory structure.  Removed hard coded
includes directory in templates.  Note that TMPL_INCLUDE tags in a template
will now use the koha.conf includes variable as a search path, so only the
filename needs to be used.


Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/html-template/search.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** search.pl	13 May 2002 23:05:45 -0000	1.9
--- search.pl	14 May 2002 19:34:44 -0000	1.10
***************
*** 31,45 ****
  my $includes=$configfile{'includes'};
  ($includes) || ($includes="/usr/local/www/hdl/htdocs/includes");
! my $templatebase="$includes/templates/catalogue/searchresults/";
! my $templatename=$query->param('template');
  my $startfrom=$query->param('startfrom');
  ($startfrom) || ($startfrom=0);
! ($templatename) || ($templatename='default.tmpl');
! $templatename=picktemplate($templatebase);
  
  
  
  
! my $template = HTML::Template->new(filename => "$templatebase$templatename", die_on_bad_params => 0);
  
  ##my @results;
--- 31,43 ----
  my $includes=$configfile{'includes'};
  ($includes) || ($includes="/usr/local/www/hdl/htdocs/includes");
! my $templatebase="catalogue/searchresults.tmpl";
  my $startfrom=$query->param('startfrom');
  ($startfrom) || ($startfrom=0);
! my $theme=picktemplate($includes, $templatebase);
  
  
  
  
! my $template = HTML::Template->new(filename => "$includes/templates/$theme/$templatebase", die_on_bad_params => 0, path => [$includes]);
  
  ##my @results;
***************
*** 68,73 ****
  $template->param(nextstartfrom => $nextstartfrom);
  $template->param(prevstartfrom => $prevstartfrom);
- $template->param(template => $templatename);
  $template->param(SEARCH_RESULTS => $resultsarray);
  
  print "Content-Type: text/html\n\n", $template->output;
--- 66,71 ----
  $template->param(nextstartfrom => $nextstartfrom);
  $template->param(prevstartfrom => $prevstartfrom);
  $template->param(SEARCH_RESULTS => $resultsarray);
+ $template->param(includesdir => $includes);
  
  print "Content-Type: text/html\n\n", $template->output;
***************
*** 75,84 ****
  
  sub picktemplate {
!     my ($base) = @_;
      my $templates;
!     opendir (D, $base);
      my @dirlist=readdir D;
      foreach (@dirlist) {
! 	(next) unless (/\.tmpl$/);
  	$templates->{$_}=1;
      }
--- 73,84 ----
  
  sub picktemplate {
!     my ($includes, $base) = @_;
      my $templates;
!     opendir (D, "$includes/templates");
      my @dirlist=readdir D;
      foreach (@dirlist) {
! 	(next) if (/^\./);
! 	#(next) unless (/\.tmpl$/);
! 	(next) unless (-e "$includes/templates/$_/$base");
  	$templates->{$_}=1;
      }
***************
*** 90,94 ****
  	return $preftemplate;
      } else {
! 	return 'default.tmpl';
      }
      
--- 90,94 ----
  	return $preftemplate;
      } else {
! 	return 'default';
      }