[Koha-cvs] CVS: koha/opac opac-detail.pl,1.1.2.3,1.1.2.4 opac-main.pl,1.1.2.2,1.1.2.3 opac-search.pl,1.1.2.3,1.1.2.4 opac-searchresults.pl,1.1.2.4,1.1.2.5 opac-user.pl,1.1.2.4,1.1.2.5 opac-userupdate.pl,1.1.2.2,1.1.2.3

[Finlay Thompson]

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

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

general fixes and tinkering


Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.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-detail.pl      2 Oct 2002 00:50:16 -0000       1.1.2.3
--- opac-detail.pl      14 Oct 2002 22:47:54 -0000      1.1.2.4
***************
*** 9,13 ****
  my $query=new CGI;
  
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query, 1);
  
  my $template = gettemplate ("opac-detail.tmpl", "opac");
--- 9,18 ----
  my $query=new CGI;
  
! 
! my $flagsrequired;
! $flagsrequired->{borrow}=1;
! 
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query, 1, 
$flagsrequired);
! 
  
  my $template = gettemplate ("opac-detail.tmpl", "opac");
***************
*** 19,23 ****
  
  # change back when ive fixed request.pl
! my @items                                 = &ItemInfo(undef, $biblionumber, 
'opac');
  my $dat                                   = &bibdata($biblionumber);
  my ($authorcount, $addauthor)             = &addauthor($biblionumber);
--- 24,28 ----
  
  # change back when ive fixed request.pl
! my @items                                 = &ItemInfo(undef, $biblionumber, 
'intra');
  my $dat                                   = &bibdata($biblionumber);
  my ($authorcount, $addauthor)             = &addauthor($biblionumber);

Index: opac-main.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-main.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** opac-main.pl        2 Oct 2002 00:50:16 -0000       1.1.2.2
--- opac-main.pl        14 Oct 2002 22:47:55 -0000      1.1.2.3
***************
*** 9,13 ****
  my $query = new CGI;
  
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query, 1);
  
  my $template = gettemplate("opac-main.tmpl", "opac");
--- 9,17 ----
  my $query = new CGI;
  
! my $flagsrequired;
! $flagsrequired->{borrow}=1;
! 
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query, 1, 
$flagsrequired);
! 
  
  my $template = gettemplate("opac-main.tmpl", "opac");

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.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-search.pl      2 Oct 2002 00:50:16 -0000       1.1.2.3
--- opac-search.pl      14 Oct 2002 22:47:55 -0000      1.1.2.4
***************
*** 8,12 ****
  
  my $query = new CGI;
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query ,1);
  
  my $template = gettemplate("opac-search.tmpl", "opac");
--- 8,16 ----
  
  my $query = new CGI;
! 
! my $flagsrequired;
! $flagsrequired->{borrow}=1;
! 
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query ,1, 
$flagsrequired);
  
  my $template = gettemplate("opac-search.tmpl", "opac");

Index: opac-searchresults.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-searchresults.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-searchresults.pl       3 Oct 2002 03:53:06 -0000       1.1.2.4
--- opac-searchresults.pl       14 Oct 2002 22:47:55 -0000      1.1.2.5
***************
*** 9,13 ****
  my $query=new CGI;
  
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query, 1);
  
  
--- 9,16 ----
  my $query=new CGI;
  
! my $flagsrequired;
! $flagsrequired->{borrow}=1;
! 
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query, 1, 
$flagsrequired);
  
  
***************
*** 53,58 ****
  # 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;
***************
*** 60,65 ****
  my $subjectitems=$query->param('subjectitems');
  if ($subjectitems) {
!     my $blah;
!     @results = subsearch(\$blah,$subjectitems, $num, $startfrom);
      $count = $#results+1;
  } else {
--- 63,67 ----
  my $subjectitems=$query->param('subjectitems');
  if ($subjectitems) {
!     @results = subsearch($env,$subjectitems, $num, $startfrom);
      $count = $#results+1;
  } else {
***************
*** 76,79 ****
--- 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');
***************
*** 118,121 ****
  $template->param(loggedinuser => $loggedinuser);
  
! print $query->header(-cookie => $cookie), $template->output;
  
--- 126,130 ----
  $template->param(loggedinuser => $loggedinuser);
  
! #print $query->header(-cookie => $cookie), $debug, $template->output;
! 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.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** opac-user.pl        14 Oct 2002 09:39:36 -0000      1.1.2.4
--- opac-user.pl        14 Oct 2002 22:47:55 -0000      1.1.2.5
***************
*** 33,36 ****
--- 33,42 ----
      $borr->{'amountoverfive'} = 0;
  }
+ if ($borr->{'amountoutstanding'} > 0) {
+     $borr->{'amountoverzero'} = 1;
+ } else {
+     $borr->{'amountoverzero'} = 0;
+     $borr->{'amountoutstanding'} = -1*($borr->{'amountoutstanding'});
+ }
  
  $borr->{'amountoutstanding'} = sprintf "\$%.02f", 
$borr->{'amountoutstanding'};
***************
*** 50,54 ****
      $issue->{'date_due'}  = slashifyDate($issue->{'date_due'});
      if ($issue->{'overdue'}) {
!       $issue->{'status'} = "OVERDUE";
      } else {
        $issue->{'status'} = "Issued";
--- 56,60 ----
      $issue->{'date_due'}  = slashifyDate($issue->{'date_due'});
      if ($issue->{'overdue'}) {
!       $issue->{'status'} = "<font color='red'>OVERDUE</font>";
      } else {
        $issue->{'status'} = "Issued";
***************
*** 57,61 ****
      my ($restype, $res) = CheckReserves($issue->{'itemnumber'});
      if ($restype) {
!       $issue->{'status'} .= "Reserved";
      }
      my ($charges, $itemtype) = calc_charges(undef, undef, 
$issue->{'itemnumber'}, $borrowernumber);
--- 63,67 ----
      my ($restype, $res) = CheckReserves($issue->{'itemnumber'});
      if ($restype) {
!       $issue->{'status'} .= " Reserved";
      }
      my ($charges, $itemtype) = calc_charges(undef, undef, 
$issue->{'itemnumber'}, $borrowernumber);
***************
*** 70,73 ****
--- 76,82 ----
  # now the reserved items....
  my ($rcount, $reserves) = FindReserves(undef, $borrowernumber);
+ foreach my $res (@$reserves) {
+     $res->{'reservedate'}  = slashifyDate($res->{'reservedate'});
+ }
  
  $template->param(RESERVES => $reserves);

Index: opac-userupdate.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-userupdate.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** opac-userupdate.pl  2 Oct 2002 00:50:16 -0000       1.1.2.2
--- opac-userupdate.pl  14 Oct 2002 22:47:55 -0000      1.1.2.3
***************
*** 13,17 ****
  my $query = new CGI;
  
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query);
  
  # get borrower information ....
--- 13,20 ----
  my $query = new CGI;
  
! my $flagsrequired;
! $flagsrequired->{borrow}=1;
! 
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query, 0, 
$flagsrequired);
  
  # get borrower information ....