[Koha-cvs] CVS: koha detail.pl,1.3.2.4,1.3.2.5 mainpage.pl,1.1.2.1,1.1.2.2 moredetail.pl,1.4.2.3,1.4.2.4 search.pl,1.6.2.13,1.6.2.14

[Steve Tonnesen]

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv9407

Modified Files:
      Tag: rel-1-2
        detail.pl mainpage.pl moredetail.pl search.pl 
Log Message:
Moved intranet templated scripts to new template directory structure.


Index: detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/detail.pl,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -C2 -r1.3.2.4 -r1.3.2.5
*** detail.pl   26 Jul 2002 18:23:54 -0000      1.3.2.4
--- detail.pl   21 Oct 2002 20:10:18 -0000      1.3.2.5
***************
*** 4,8 ****
  require Exporter;
  use C4::Database;
! use C4::Output;  # contains picktemplate
  use CGI;
  use C4::Search;
--- 4,8 ----
  require Exporter;
  use C4::Database;
! use C4::Output;  # contains gettemplate
  use CGI;
  use C4::Search;
***************
*** 16,42 ****
  
  
- my $language='french';
- 
- 
- my %configfile;
- open (KC, "/etc/koha.conf");
- while (<KC>) {
-  chomp;
-  (next) if (/^\s*#/);
-  if (/(.*)\s*=\s*(.*)/) {
-    my $variable=$1;
-    my $value=$2;
-    # Clean up white space at beginning and end
-    $variable=~s/^\s*//g;
-    $variable=~s/\s*$//g;
-    $value=~s/^\s*//g;
-    $value=~s/\s*$//g;
-    $configfile{$variable}=$value;
-  }
- }
- 
  my $biblionumber=$query->param('bib');
  
- 
  # change back when ive fixed request.pl
  my @items = ItemInfo(undef, $biblionumber, $type);
--- 16,21 ----
***************
*** 62,75 ****
  my address@hidden;
  
- my $includes=$configfile{'includes'};
- ($includes) || ($includes="/usr/local/www/hdl/htdocs/includes");
- my $templatebase="catalogue/detail.tmpl";
- ($type eq 'opac') && ($templatebase="catalogue/detail-opac.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 $count=1;
  
--- 41,48 ----
  my address@hidden;
  
  my $startfrom=$query->param('startfrom');
  ($startfrom) || ($startfrom=0);
  
+ my $template=gettemplate('catalogue/detail.tmpl');
  my $count=1;
  
***************
*** 86,90 ****
  # $template->param(template => $templatename);
  # $template->param(search => $search);
! $template->param(includesdir => $includes);
  $template->param(BIBLIO_RESULTS => $resultsarray);
  $template->param(ITEM_RESULTS => $itemsarray);
--- 59,63 ----
  # $template->param(template => $templatename);
  # $template->param(search => $search);
! #$template->param(includesdir => $includes);
  $template->param(BIBLIO_RESULTS => $resultsarray);
  $template->param(ITEM_RESULTS => $itemsarray);

Index: mainpage.pl
===================================================================
RCS file: /cvsroot/koha/koha/mainpage.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** mainpage.pl 11 Jul 2002 18:05:28 -0000      1.1.2.1
--- mainpage.pl 21 Oct 2002 20:10:18 -0000      1.1.2.2
***************
*** 4,8 ****
  require Exporter;
  use C4::Database;
! use C4::Output;  # contains picktemplate
  use CGI;
  use C4::Auth;
--- 4,8 ----
  require Exporter;
  use C4::Database;
! use C4::Output;  # contains gettemplate
  use CGI;
  use C4::Auth;
***************
*** 11,37 ****
  my ($loggedinuser, $cookie, $sessionID) = checkauth($query);
  
! my %configfile;
! open (KC, "/etc/koha.conf");
! while (<KC>) {
!  chomp;
!  (next) if (/^\s*#/);
!  if (/(.*)\s*=\s*(.*)/) {
!    my $variable=$1;
!    my $value=$2;
!    # Clean up white space at beginning and end
!    $variable=~s/^\s*//g;
!    $variable=~s/\s*$//g;
!    $value=~s/^\s*//g;
!    $value=~s/\s*$//g;
!    $configfile{$variable}=$value;
!  }
! }
! 
! my $includes=$configfile{'includes'};
! ($includes) || ($includes="/usr/local/www/hdl/htdocs/includes");
! my $templatebase="catalogue/intranet-main.tmpl";
! my $theme=picktemplate($includes, $templatebase);
! 
! my $template = HTML::Template->new(filename => 
"$includes/templates/$theme/$templatebase", die_on_bad_params => 0, path => 
[$includes]);
  
  #$template->param(SITE_RESULTS => $sitearray);
--- 11,15 ----
  my ($loggedinuser, $cookie, $sessionID) = checkauth($query);
  
! my $template = gettemplate("intranet-main.tmpl");
  
  #$template->param(SITE_RESULTS => $sitearray);

Index: moredetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/moredetail.pl,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -r1.4.2.3 -r1.4.2.4
*** moredetail.pl       11 Sep 2002 21:28:28 -0000      1.4.2.3
--- moredetail.pl       21 Oct 2002 20:10:18 -0000      1.4.2.4
***************
*** 7,11 ****
  use C4::Search;
  use C4::Acquisitions;
! use C4::Output; # contains picktemplate
  use C4::Auth;
    
--- 7,11 ----
  use C4::Search;
  use C4::Acquisitions;
! use C4::Output; # contains gettemplate
  use C4::Auth;
    
***************
*** 16,52 ****
  my ($loggedinuser, $cookie, $sessionID) = checkauth($query, 0, 
$flagsrequired);
  
- my $language='french';
- 
- 
- my %configfile;
- open (KC, "/etc/koha.conf");
- while (<KC>) {
-  chomp;
-  (next) if (/^\s*#/);
-  if (/(.*)\s*=\s*(.*)/) {
-    my $variable=$1;
-    my $value=$2;
-    # Clean up white space at beginning and end
-    $variable=~s/^\s*//g;
-    $variable=~s/\s*$//g;
-    $value=~s/^\s*//g;
-    $value=~s/\s*$//g;
-    $configfile{$variable}=$value;
-  }
- }
- 
- my $includes=$configfile{'includes'};
- ($includes) || ($includes="/usr/local/www/hdl/htdocs/includes");
- my $templatebase="catalogue/moredetail.tmpl";
  my $startfrom=$query->param('startfrom');
  ($startfrom) || ($startfrom=0);
- my $theme=picktemplate($includes, $templatebase);
  
! my $subject=$query->param('subject');
! # if its a subject we need to use the subject.tmpl
! if ($subject){
!   $templatebase=~ s/searchresults\.tmpl/subject\.tmpl/;
! }
! my $template = HTML::Template->new(filename => 
"$includes/templates/$theme/$templatebase", die_on_bad_params => 0, path => 
[$includes]);
  
  # get variables 
--- 16,24 ----
  my ($loggedinuser, $cookie, $sessionID) = checkauth($query, 0, 
$flagsrequired);
  
  my $startfrom=$query->param('startfrom');
  ($startfrom) || ($startfrom=0);
  
! 
! my $template=gettemplate('catalogue/moredetail.tmpl');
  
  # get variables 
***************
*** 100,104 ****
  }
  
- $template->param(includesdir => $includes);
  $template->param(BIBITEM_DATA => address@hidden);
  $template->param(ITEM_DATA => address@hidden);
--- 72,75 ----

Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.pl,v
retrieving revision 1.6.2.13
retrieving revision 1.6.2.14
diff -C2 -r1.6.2.13 -r1.6.2.14
*** search.pl   2 Oct 2002 19:40:53 -0000       1.6.2.13
--- search.pl   21 Oct 2002 20:10:18 -0000      1.6.2.14
***************
*** 7,11 ****
  use C4::Search;
  use C4::Auth;
! use C4::Output; # no contains picktemplate
    
  my $query=new CGI;
--- 7,11 ----
  use C4::Search;
  use C4::Auth;
! use C4::Output; # no contains gettemplate
    
  my $query=new CGI;
***************
*** 16,55 ****
  
  
- my $language='french';
  
- 
- my %configfile;
- open (KC, "/etc/koha.conf");
- while (<KC>) {
-  chomp;
-  (next) if (/^\s*#/);
-  if (/(.*)\s*=\s*(.*)/) {
-    my $variable=$1;
-    my $value=$2;
-    # Clean up white space at beginning and end
-    $variable=~s/^\s*//g;
-    $variable=~s/\s*$//g;
-    $value=~s/^\s*//g;
-    $value=~s/\s*$//g;
-    $configfile{$variable}=$value;
-  }
- }
- #print $query->header;
- 
- 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 $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]);
  
  my $env;
--- 16,32 ----
  
  
  
  my $startfrom=$query->param('startfrom');
  ($startfrom) || ($startfrom=0);
  
  my $subject=$query->param('subject');
! 
! my $template;
  if ($subject) {
!     $template=gettemplate('catalogue/subject.tmpl');
! } else {
!     $template=gettemplate('catalogue/searchresults.tmpl');
  }
  
  
  my $env;
***************
*** 184,188 ****
  $template->param(searchdesc => $searchdesc);
  $template->param(SEARCH_RESULTS => $resultsarray);
! $template->param(includesdir => $includes);
  $template->param(loggedinuser => $loggedinuser);
  
--- 161,165 ----
  $template->param(searchdesc => $searchdesc);
  $template->param(SEARCH_RESULTS => $resultsarray);
! #$template->param(includesdir => $includes);
  $template->param(loggedinuser => $loggedinuser);