koha-cvs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] CVS: koha/opac opac-detail.pl,1.1.2.5,1.1.2.6 opac-logout.pl,

From: Steve Tonnesen
Subject: [Koha-cvs] CVS: koha/opac opac-detail.pl,1.1.2.5,1.1.2.6 opac-logout.pl,1.1.2.1,1.1.2.2 opac-moredetail.pl,1.1.2.1,1.1.2.2 opac-reserve.pl,1.1.2.4,1.1.2.5 opac-search.pl,1.1.2.4,1.1.2.5 opac-searchresults.pl,1.1.2.5,1.1.2.6 opac-user.pl,1.1.2.6,1.1.2.7 opac-userupdate.pl,1.1.2.3,1.1.2.4
Date: Mon, 28 Oct 2002 11:56:15 -0800 
Update of /cvsroot/koha/koha/opac
In directory usw-pr-cvs1:/tmp/cvs-serv2593/opac

Modified Files:
      Tag: rel-1-2
        opac-detail.pl opac-logout.pl opac-moredetail.pl 
        opac-reserve.pl opac-search.pl opac-searchresults.pl 
        opac-user.pl opac-userupdate.pl 
Log Message:
Merging from trunk to rel-1-2


Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -r1.1.2.5 -r1.1.2.6
*** opac-detail.pl      15 Oct 2002 23:36:01 -0000      1.1.2.5
--- opac-detail.pl      28 Oct 2002 19:56:04 -0000      1.1.2.6
***************
*** 2,10 ****
  use strict;
  require Exporter;
! use C4::Output;  # contains picktemplate
  use CGI;
  use C4::Search;
  use C4::Auth;
!  
  my $query=new CGI;
  
--- 2,10 ----
  use strict;
  require Exporter;
! use C4::Output;  # contains gettemplate
  use CGI;
  use C4::Search;
  use C4::Auth;
! 
  my $query=new CGI;
  
***************
*** 25,29 ****
  
  # change back when ive fixed request.pl
! my @items                                 = &ItemInfo(undef, $biblionumber, 
'intra');
  my $dat                                   = &bibdata($biblionumber);
  my ($authorcount, $addauthor)             = &addauthor($biblionumber);
--- 25,29 ----
  
  # change back when ive fixed request.pl
! my @items                                 = &ItemInfo(undef, $biblionumber, 
'opac');
  my $dat                                   = &bibdata($biblionumber);
  my ($authorcount, $addauthor)             = &addauthor($biblionumber);

Index: opac-logout.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-logout.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-logout.pl      1 Oct 2002 07:09:03 -0000       1.1.2.1
--- opac-logout.pl      28 Oct 2002 19:56:06 -0000      1.1.2.2
***************
*** 2,6 ****
  
  use CGI;
! use C4::Database;
  use C4::Output;
  
--- 2,6 ----
  
  use CGI;
! use C4::Context;
  use C4::Output;
  
***************
*** 28,31 ****
--- 28,32 ----
  my $sessions;
  open (S, "/tmp/sessions");
+       # FIXME - Come up with a better logging mechanism
  while (my ($sid, $u, $lasttime) = split(/:/, <S>)) {
      chomp $lasttime;
***************
*** 42,46 ****
  }
  
! my $dbh=C4Connect;
  
  # Check that this is the ip that created the session before deleting it
--- 43,47 ----
  }
  
! my $dbh = C4::Context->dbh;
  
  # Check that this is the ip that created the session before deleting it
***************
*** 57,62 ****
  }
  
! $sth=$dbh->prepare("delete from sessions where sessionID=?");
! $sth->execute($sessionID);
  open L, ">>/tmp/sessionlog";
  my $time=localtime(time());
--- 58,62 ----
  }
  
! $dbh->do("delete from sessions where sessionID=?", $sessionID);
  open L, ">>/tmp/sessionlog";
  my $time=localtime(time());

Index: opac-moredetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-moredetail.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-moredetail.pl  18 Sep 2002 06:25:55 -0000      1.1.2.1
--- opac-moredetail.pl  28 Oct 2002 19:56:07 -0000      1.1.2.2
***************
*** 44,55 ****
  print center();
  
! my $dewey = $data->{'dewey'};                                                 
 
! $dewey =~ s/0+$//;                                                            
 
! if ($dewey eq "000.") { $dewey = "";};                                        
 
! if ($dewey < 10){$dewey='00'.$dewey;}                                         
 
! if ($dewey < 100 && $dewey > 10){$dewey='0'.$dewey;}                          
 
  if ($dewey <= 0){
!   $dewey='';                                                                  
 
! }               
  $dewey=~ s/\.$//;
  print <<printend
--- 44,55 ----
  print center();
  
! my $dewey = $data->{'dewey'};
! $dewey =~ s/0+$//;
! if ($dewey eq "000.") { $dewey = "";};
! if ($dewey < 10){$dewey='00'.$dewey;}
! if ($dewey < 100 && $dewey > 10){$dewey='0'.$dewey;}
  if ($dewey <= 0){
!   $dewey='';
! }
  $dewey=~ s/\.$//;
  print <<printend
***************
*** 74,79 ****
  <tr VALIGN=TOP  >
  <TD width=210 >
! <INPUT TYPE="image" name="submit"  VALUE="modify" height=42  WIDTH=93 
BORDER=0 src="/images/modify-mem.gif"> 
! <INPUT TYPE="image" name="delete"  VALUE="delete" height=42  WIDTH=93 
BORDER=0 src="/images/delete-mem.gif"> 
  <br>
  <FONT SIZE=2  face="arial, helvetica">
--- 74,79 ----
  <tr VALIGN=TOP  >
  <TD width=210 >
! <INPUT TYPE="image" name="submit"  VALUE="modify" height=42  WIDTH=93 
BORDER=0 src="/images/modify-mem.gif">
! <INPUT TYPE="image" name="delete"  VALUE="delete" height=42  WIDTH=93 
BORDER=0 src="/images/delete-mem.gif">
  <br>
  <FONT SIZE=2  face="arial, helvetica">
***************
*** 98,102 ****
  if ($type eq 'catmain'){
    print "<br><a 
href=/cgi-bin/koha/maint/shiftbib.pl?bi=$data->{'biblioitemnumber'}&bib=$data->{'biblionumber'}>Shift
 to another biblio</a>";
!  
  }
  print <<printend
--- 98,102 ----
  if ($type eq 'catmain'){
    print "<br><a 
href=/cgi-bin/koha/maint/shiftbib.pl?bi=$data->{'biblioitemnumber'}&bib=$data->{'biblionumber'}>Shift
 to another biblio</a>";
! 
  }
  print <<printend
***************
*** 113,117 ****
  print <<printend
  <img src="/images/holder.gif" width=16 height=300 align=left>
! <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width=220 >          
                
  <TR VALIGN=TOP>
  <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>BARCODE 
$items[$i]->{'barcode'}</b></TD>
--- 113,117 ----
  print <<printend
  <img src="/images/holder.gif" width=16 height=300 align=left>
! <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width=220 >
  <TR VALIGN=TOP>
  <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>BARCODE 
$items[$i]->{'barcode'}</b></TD>
***************
*** 123,128 ****
  <input type=hidden name=item value=$items[$i]->{'itemnumber'}>
  <input type=hidden name=type value=$type>
! <INPUT TYPE="image" name="submit"  VALUE="modify" height=42  WIDTH=93 
BORDER=0 src="/images/modify-mem.gif"> 
! <INPUT TYPE="image" name="delete"  VALUE="delete" height=42  WIDTH=93 
BORDER=0 src="/images/delete-mem.gif"> 
  <br>
  printend
--- 123,128 ----
  <input type=hidden name=item value=$items[$i]->{'itemnumber'}>
  <input type=hidden name=type value=$type>
! <INPUT TYPE="image" name="submit"  VALUE="modify" height=42  WIDTH=93 
BORDER=0 src="/images/modify-mem.gif">
! <INPUT TYPE="image" name="delete"  VALUE="delete" height=42  WIDTH=93 
BORDER=0 src="/images/delete-mem.gif">
  <br>
  printend

Index: opac-reserve.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-reserve.pl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** opac-reserve.pl     15 Oct 2002 04:43:09 -0000      1.1.2.4
--- opac-reserve.pl     28 Oct 2002 19:56:07 -0000      1.1.2.5
***************
*** 64,68 ****
      (next) unless $branches->{$br}->{'IS'};
      my $selected = "";
!     if ($br eq 'L') {
        $selected = "selected";
      }
--- 64,68 ----
      (next) unless $branches->{$br}->{'IS'};
      my $selected = "";
!     if ($br eq $branch) {
        $selected = "selected";
      }
***************
*** 173,175 ****
  
  $template->param(loggedinuser => $loggedinuser);
! print "Content-Type: text/html\n\n", $template->output; 
--- 173,175 ----
  
  $template->param(loggedinuser => $loggedinuser);
! print "Content-Type: text/html\n\n", $template->output;

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** opac-search.pl      14 Oct 2002 22:47:55 -0000      1.1.2.4
--- opac-search.pl      28 Oct 2002 19:56:09 -0000      1.1.2.5
***************
*** 3,7 ****
  require Exporter;
  
! use C4::Output;  
  use CGI;
  use C4::Auth;
--- 3,7 ----
  require Exporter;
  
! use C4::Output;
  use CGI;
  use C4::Auth;

Index: opac-searchresults.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-searchresults.pl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -r1.1.2.5 -r1.1.2.6
*** opac-searchresults.pl       14 Oct 2002 22:47:55 -0000      1.1.2.5
--- opac-searchresults.pl       28 Oct 2002 19:56:09 -0000      1.1.2.6
***************
*** 5,10 ****
  use C4::Search;
  use C4::Auth;
! use C4::Output; # now contains picktemplate
!   
  my $query=new CGI;
  
--- 5,10 ----
  use C4::Search;
  use C4::Auth;
! use C4::Output; # now contains gettemplate
! 
  my $query=new CGI;
  
***************
*** 56,61 ****
  # do the searchs ....
  my $env;
! $env->{'itemcount'}=1;
! my $num = 10;
  my @results;
  my $count;
--- 56,61 ----
  # do the searchs ....
  my $env;
! $env->{itemcount}=1;
! my $num=10;
  my @results;
  my $count;
***************
*** 78,87 ****
  }
  
- my $debug = "";
- foreach my $res (@results) {
-     $debug .= "title : $res->{'title'} <br>";
-     $debug .= "biblionumber : $res->{'biblionumber'} <br>";
-     $debug .= "location : $res->{'location'} <br><hr><br>x";
- }
  
  my $startfrom=$query->param('startfrom');
--- 78,81 ----
***************
*** 126,130 ****
  $template->param(loggedinuser => $loggedinuser);
  
! #print $query->header(-cookie => $cookie), $debug, $template->output;
! print $query->header(-cookie => $cookie),  $template->output;
  
--- 120,123 ----
  $template->param(loggedinuser => $loggedinuser);
  
! print $query->header(-cookie => $cookie), $template->output;
  

Index: opac-user.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -r1.1.2.6 -r1.1.2.7
*** opac-user.pl        15 Oct 2002 04:43:09 -0000      1.1.2.6
--- opac-user.pl        28 Oct 2002 19:56:10 -0000      1.1.2.7
***************
*** 65,75 ****
      }
      my ($charges, $itemtype) = calc_charges(undef, undef, 
$issue->{'itemnumber'}, $borrowernumber);
!     $issue->{'charges'} = $charges; 
      push @issuedat, $issue;
      $count++;
! } 
  
! $template->param(ISSUES => address@hidden); 
! $template->param(issues_count => $count); 
  
  # now the reserved items....
--- 65,75 ----
      }
      my ($charges, $itemtype) = calc_charges(undef, undef, 
$issue->{'itemnumber'}, $borrowernumber);
!     $issue->{'charges'} = $charges;
      push @issuedat, $issue;
      $count++;
! }
  
! $template->param(ISSUES => address@hidden);
! $template->param(issues_count => $count);
  
  # now the reserved items....
***************
*** 97,99 ****
  
  $template->param(loggedinuser => $loggedinuser);
! print "Content-Type: text/html\n\n", $template->output; 
--- 97,99 ----
  
  $template->param(loggedinuser => $loggedinuser);
! print "Content-Type: text/html\n\n", $template->output;

Index: opac-userupdate.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-userupdate.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** opac-userupdate.pl  14 Oct 2002 22:47:55 -0000      1.1.2.3
--- opac-userupdate.pl  28 Oct 2002 19:56:10 -0000      1.1.2.4
***************
*** 52,56 ****
          warn "Error sending mail: $Mail::Sendmail::error \n";
      }
! } 
  
  my $template = gettemplate("opac-userupdate.tmpl", "opac");
--- 52,56 ----
          warn "Error sending mail: $Mail::Sendmail::error \n";
      }
! }
  
  my $template = gettemplate("opac-userupdate.tmpl", "opac");
***************
*** 71,73 ****
  $template->param(loggedinuser => $loggedinuser);
  
! print "Content-Type: text/html\n\n", $template->output; 
--- 71,73 ----
  $template->param(loggedinuser => $loggedinuser);
  
! print "Content-Type: text/html\n\n", $template->output;
reply via email to
[Prev in Thread] Current Thread [Next in Thread]