[Koha-cvs] CVS: koha/opac opac-detail.pl,1.1.2.1,1.1.2.2 opac-search.pl,1.1.2.1,1.1.2.2 opac-searchresults.pl,1.1.2.1,1.1.2.2

[Finlay Thompson]

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

Modified Files:
      Tag: rel-1-2
        opac-detail.pl opac-search.pl opac-searchresults.pl 
Log Message:

fixing up few loose ends. Also made opac-searchresults.pl use only on tmplate: 
opac-searchresults.tmpl


Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/Attic/opac-detail.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-detail.pl      18 Sep 2002 06:25:55 -0000      1.1.2.1
--- opac-detail.pl      18 Sep 2002 07:53:42 -0000      1.1.2.2
***************
*** 11,23 ****
  my ($loggedinuser, $cookie, $sessionID) = checkauth($query, 1);
  
! my $template = gettemplate ("detail.tmpl", "opac");
  
  my $biblionumber=$query->param('bib');
! my $type='intra';
  
  # change back when ive fixed request.pl
! my @items = ItemInfo(undef, $biblionumber, $type);
! my $dat=bibdata($biblionumber);
! my ($authorcount, $addauthor)= &addauthor($biblionumber);
  my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
  my ($websitecount, @websites)             = &getwebsites($biblionumber);
--- 11,23 ----
  my ($loggedinuser, $cookie, $sessionID) = checkauth($query, 1);
  
! my $template = gettemplate ("opac-detail.tmpl", "opac");
  
  my $biblionumber=$query->param('bib');
! 
  
  # change back when ive fixed request.pl
! my @items                                 = &ItemInfo(undef, $biblionumber, 
'opac');
! my $dat                                   = &bibdata($biblionumber);
! my ($authorcount, $addauthor)             = &addauthor($biblionumber);
  my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
  my ($websitecount, @websites)             = &getwebsites($biblionumber);

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/Attic/opac-search.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-search.pl      18 Sep 2002 06:25:55 -0000      1.1.2.1
--- opac-search.pl      18 Sep 2002 07:53:42 -0000      1.1.2.2
***************
*** 3,15 ****
  require Exporter;
  
! use C4::Output;  # contains picktemplate
  use CGI;
  use C4::Auth;
  
  my $query = new CGI;
! #my ($loggedinuser, $cookie, $sessionID) = checkauth($query);
  
  my $template = gettemplate("opac-search.tmpl", "opac");
  
- #$template->param(SITE_RESULTS => $sitearray);
  print "Content-Type: text/html\n\n", $template->output;
--- 3,14 ----
  require Exporter;
  
! use C4::Output;  
  use CGI;
  use C4::Auth;
  
  my $query = new CGI;
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query ,1);
  
  my $template = gettemplate("opac-search.tmpl", "opac");
  
  print "Content-Type: text/html\n\n", $template->output;

Index: opac-searchresults.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/Attic/opac-searchresults.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-searchresults.pl       18 Sep 2002 06:25:55 -0000      1.1.2.1
--- opac-searchresults.pl       18 Sep 2002 07:53:42 -0000      1.1.2.2
***************
*** 12,22 ****
  
  
! my $template;
  my $subject=$query->param('subject');
! # if its a subject we need to use the subject.tmpl
  if ($subject) {
!     $template = gettemplate ("subject.tmpl", "opac");
! } else {
!     $template = gettemplate ("searchresults.tmpl", "opac");
  }
  
--- 12,24 ----
  
  
! my $template = gettemplate ("opac-searchresults.tmpl", "opac");
! 
! 
! 
  my $subject=$query->param('subject');
! 
! 
  if ($subject) {
!     $template->param(subjectsearch => $subject);
  }