[Koha-cvs] CVS: koha/opac opac-passwd.pl,1.1,1.2 opac-account.pl,1.8,1.9 opac-addbookbybiblionumber.pl,1.2,1.3 opac-detail.pl,1.22,1.23 opac-ISBDdetail.pl,1.7,1.8 opac-readingrecord.pl,1.7,1.8 opac-reserve.pl,1.25,1.26

[Paul POULAIN]

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22771/opac

Modified Files:
        opac-account.pl opac-addbookbybiblionumber.pl opac-detail.pl 
        opac-ISBDdetail.pl opac-readingrecord.pl opac-reserve.pl 
Added Files:
        opac-passwd.pl 
Log Message:
synch'ing 2.2 and head


Index: opac-account.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-account.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** opac-account.pl     8 Jan 2004 18:23:36 -0000       1.8
--- opac-account.pl     4 Aug 2005 14:19:49 -0000       1.9
***************
*** 37,42 ****
  
  for (my $i=0;$i<$numaccts;$i++){
!     $accts->[$i]{'amount'}+=0.00;
!     $accts->[$i]{'amountoutstanding'}+=0.00;
      if ($accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 
'FU'){
        $accts->[$i]{'print_title'};
--- 37,49 ----
  
  for (my $i=0;$i<$numaccts;$i++){
!       $accts->[$i]{'date'} = format_date($accts->[$i]{'date'});
!     $accts->[$i]{'amount'} = sprintf("%.2f", $accts->[$i]{'amount'});
!       if($accts->[$i]{'amount'} >= 0){
!               $accts->[$i]{'amountcredit'} = 1;
!       }
!     $accts->[$i]{'amountoutstanding'} =sprintf("%.2f", 
$accts->[$i]{'amountoutstanding'});
!       if($accts->[$i]{'amountoutstanding'} >= 0){
!               $accts->[$i]{'amountoutstandingcredit'} = 1;
!       }
      if ($accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 
'FU'){
        $accts->[$i]{'print_title'};
***************
*** 55,61 ****
  $template->param( ACCOUNT_LINES => $accts,
                             LibraryName => 
C4::Context->preference("LibraryName"),
   );
  
! $template->param( total => $total );
  
  #$template->param(loggeninuser => $loggedinuser);
--- 62,70 ----
  $template->param( ACCOUNT_LINES => $accts,
                             LibraryName => 
C4::Context->preference("LibraryName"),
+                               suggestion => 
C4::Context->preference("suggestion"),
+                               virtualshelves => 
C4::Context->preference("virtualshelves")
   );
  
! $template->param( total => sprintf("%.2f",$total) );
  
  #$template->param(loggeninuser => $loggedinuser);

Index: opac-addbookbybiblionumber.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-addbookbybiblionumber.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac-addbookbybiblionumber.pl       4 May 2005 09:02:38 -0000       1.2
--- opac-addbookbybiblionumber.pl       4 Aug 2005 14:19:50 -0000       1.3
***************
*** 84,88 ****
  }
  # $Log$
! # Revision 1.2  2005/05/04 09:02:38  tipaul
  # synch'ing 2.2 and head
  #
--- 84,88 ----
  }
  # $Log$
! # Revision 1.3  2005/08/04 14:19:50  tipaul
  # synch'ing 2.2 and head
  #

Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** opac-detail.pl      27 Jun 2005 22:26:16 -0000      1.22
--- opac-detail.pl      4 Aug 2005 14:19:50 -0000       1.23
***************
*** 76,88 ****
    ## get notes and subjects from MARC record
  my $marc = C4::Context->preference("marc");
! if ($marc eq "yes") {
        my $dbh = C4::Context->dbh;
        my $bibid = 
&MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber);
        my $marcflavour = C4::Context->preference("marcflavour");
        my $marcnotesarray = &getMARCnotes($dbh,$bibid,$marcflavour);
        my $marcsubjctsarray = &getMARCsubjects($dbh,$bibid,$marcflavour);
! 
!       $template->param(MARCNOTES => $marcnotesarray);
!       $template->param(MARCSUBJCTS => $marcsubjctsarray);
  }
  
--- 76,90 ----
    ## get notes and subjects from MARC record
  my $marc = C4::Context->preference("marc");
! my @results = ($dat,);
! if (C4::Boolean::true_p($marc)) {
        my $dbh = C4::Context->dbh;
        my $bibid = 
&MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber);
        my $marcflavour = C4::Context->preference("marcflavour");
        my $marcnotesarray = &getMARCnotes($dbh,$bibid,$marcflavour);
+       $results[0]->{MARCNOTES} = $marcnotesarray;
        my $marcsubjctsarray = &getMARCsubjects($dbh,$bibid,$marcflavour);
!       $results[0]->{MARCSUBJCTS} = $marcsubjctsarray;
! #     $template->param(MARCNOTES => $marcnotesarray);
! #     $template->param(MARCSUBJCTS => $marcsubjctsarray);
  }
  
***************
*** 158,159 ****
--- 160,162 ----
  =cut
  output_html_with_http_headers $query, $cookie, $template->output;
+ 

Index: opac-ISBDdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-ISBDdetail.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** opac-ISBDdetail.pl  4 May 2005 09:02:38 -0000       1.7
--- opac-ISBDdetail.pl  4 Aug 2005 14:19:50 -0000       1.8
***************
*** 115,119 ****
                                                my $subfieldvalue = 
get_authorised_value_desc($tag, $subf[$i][0], $subf[$i][1], '', $dbh);
                                                my $tagsubf = 
$tag.$subfieldcode;
!                                               $calculated =~ 
s/\{(.?.?.?)$tagsubf(.*?)\}/$1$subfieldvalue\{$1$tagsubf$2\}$2/g;
                                        }
                                        # field builded, store the result
--- 115,119 ----
                                                my $subfieldvalue = 
get_authorised_value_desc($tag, $subf[$i][0], $subf[$i][1], '', $dbh);
                                                my $tagsubf = 
$tag.$subfieldcode;
!                                               $calculated =~ 
s/\{(.?.?.?)$tagsubf(.*?)\}/$1$subfieldvalue$2\{$1$tagsubf$2\}/g;
                                        }
                                        # field builded, store the result

Index: opac-readingrecord.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-readingrecord.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** opac-readingrecord.pl       4 May 2005 09:02:38 -0000       1.7
--- opac-readingrecord.pl       4 Aug 2005 14:19:50 -0000       1.8
***************
*** 7,10 ****
--- 7,11 ----
  use C4::Koha;
  use C4::Circulation::Circ2;
+ use C4::Date;
  use C4::Search;
  use HTML::Template;
***************
*** 32,36 ****
--- 33,47 ----
  if ($order2 eq ''){
    $order2="date_due desc";
+   $template->param(orderbydate => 1);
  }
+ 
+ if($order2 eq 'title'){
+       $template->param(orderbytitle => 1);
+       }
+ 
+ if($order2 eq 'author'){
+       $template->param(orderbyauthor => 1);
+ }
+ 
  my $limit=$query->param('limit');
  if ($limit eq 'full'){
***************
*** 42,54 ****
  
  # add the row parity
! my $num = 0;
! foreach my $row (@$issues) {
!     $row->{'even'} = 1 if $num % 2 == 0;
!     $row->{'odd'} = 1 if $num % 2 == 1;
!     $num++;
  }
  
  $template->param(count => $count);
! $template->param(READING_RECORD => $issues,
                             LibraryName => 
C4::Context->preference("LibraryName"),
                                suggestion => 
C4::Context->preference("suggestion"),
--- 53,85 ----
  
  # add the row parity
! #my $num = 0;
! #foreach my $row (@$issues) {
! #    $row->{'even'} = 1 if $num % 2 == 0;
! #    $row->{'odd'} = 1 if $num % 2 == 1;
! #    $num++;
! #}
! 
! my @loop_reading;
! 
! for (my $i=0;$i<$count;$i++){
!       my %line;
!       if($i%2){
!               $line{'toggle'} = 1;
!       }
!       $line{biblionumber}=$issues->[$i]->{'biblionumber'};
!       $line{title}=$issues->[$i]->{'title'};
!       $line{author}=$issues->[$i]->{'author'};
!       $line{classification} = $issues->[$i]->{'classification'};
!       $line{date_due}=format_date($issues->[$i]->{'date_due'});
!       $line{returndate}=format_date($issues->[$i]->{'returndate'});
!       $line{volumeddesc}=$issues->[$i]->{'volumeddesc'};
!       $line{counter} = $i + 1;
!       push(@loop_reading,\%line);
  }
  
  $template->param(count => $count);
! $template->param(READING_RECORD => address@hidden,
!                               limit => $limit,
!                               showfulllink => ($count > 50),          
                             LibraryName => 
C4::Context->preference("LibraryName"),
                                suggestion => 
C4::Context->preference("suggestion"),

Index: opac-reserve.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-reserve.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** opac-reserve.pl     6 Jul 2005 21:32:02 -0000       1.25
--- opac-reserve.pl     4 Aug 2005 14:19:50 -0000       1.26
***************
*** 212,219 ****
                $template->param(fee => $fee,istherefee => $fee>0?1:0);
                $template->param(item_types_selected => 1);
        } else {
                $template->param(message => 1);
                $template->param(no_items_selected => 1) unless ($proceed);
!               $template->param(no_branch_selected =>1) unless ($branch);
        }
  } elsif ($query->param('place_reserve')) {
--- 212,222 ----
                $template->param(fee => $fee,istherefee => $fee>0?1:0);
                $template->param(item_types_selected => 1);
+               warn "Branch is ==$branch==";
+               $template->param(no_branch_selected => 1) unless ($branch!='');
        } else {
                $template->param(message => 1);
                $template->param(no_items_selected => 1) unless ($proceed);
!               $template->param(no_branch_selected => 1) unless ($branch);
!               warn "Branch is ==$branch==";
        }
  } elsif ($query->param('place_reserve')) {