[Koha-cvs] CVS: koha/opac opac-dictionary.pl,1.1,1.2 opac-detail.pl,1.19,1.20 opac-main.pl,1.16,1.17 opac-search.pl,1.29,1.30 opac-sendbasket.pl,1.6,1.7 opac-serial-issues.pl,1.3,1.4 opac-user.pl,1.16,1.17

[Paul POULAIN]

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

Modified Files:
        opac-detail.pl opac-main.pl opac-search.pl opac-sendbasket.pl 
        opac-serial-issues.pl opac-user.pl 
Added Files:
        opac-dictionary.pl 
Log Message:
synch'ing 2.2 and head


Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** opac-detail.pl      17 Jun 2005 13:44:25 -0000      1.19
--- opac-detail.pl      20 Jun 2005 14:33:32 -0000      1.20
***************
*** 30,33 ****
--- 30,34 ----
  my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
  my ($websitecount, @websites)             = &getwebsites($biblionumber);
+ my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
  
  $dat->{'count'address@hidden;
***************
*** 85,89 ****
                                SITE_RESULTS => $sitearray,
                                subscriptionsnumber => $subscriptionsnumber,
-                               subscriptions => address@hidden,
                             LibraryName => 
C4::Context->preference("LibraryName"),
                                suggestion => 
C4::Context->preference("suggestion"),
--- 86,89 ----
***************
*** 124,125 ****
--- 124,127 ----
  #output_html_with_http_headers $query, $cookie, $template->output;
  
+ output_html_with_http_headers $query, $cookie, $template->output;
+ 

Index: opac-main.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-main.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** opac-main.pl        4 Oct 2004 20:20:25 -0000       1.16
--- opac-main.pl        20 Jun 2005 14:33:32 -0000      1.17
***************
*** 53,56 ****
--- 53,57 ----
                                languages => address@hidden,
                                textmessaging => $borrower->{textmessaging},
+                               opaclargeimage => 
C4::Context->preference("opaclargeimage"),
  );
  output_html_with_http_headers $input, $cookie, $template->output;

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** opac-search.pl      3 Jun 2005 04:15:29 -0000       1.29
--- opac-search.pl      20 Jun 2005 14:33:32 -0000      1.30
***************
*** 9,13 ****
  use C4::Database;
  use HTML::Template;
! use C4::SearchMarc;
  use C4::Acquisition;
  use C4::Biblio;
--- 9,13 ----
  use C4::Database;
  use HTML::Template;
! use C4::SearchMarcTest;
  use C4::Acquisition;
  use C4::Biblio;
***************
*** 412,416 ****
  }
  # ADDED BY JF
! if ($totalresults == 1){
      # if its a barcode search by definition we will only have one result.
      # And if we have a result
--- 412,416 ----
  }
  # ADDED BY JF
! #if ($totalresults == 1){
      # if its a barcode search by definition we will only have one result.
      # And if we have a result

Index: opac-sendbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sendbasket.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** opac-sendbasket.pl  20 Jun 2005 01:01:06 -0000      1.6
--- opac-sendbasket.pl  20 Jun 2005 14:33:32 -0000      1.7
***************
*** 8,11 ****
--- 8,12 ----
  use C4::Context;
  use C4::Search;
+ use C4::Biblio;
  use C4::Auth;
  use C4::Interface::CGI::Output;
***************
*** 15,106 ****
  my $query = new CGI;
  
! my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
!     {
!         template_name   => "opac-sendbasketform.tmpl",
!         query           => $query,
!         type            => "opac",
!         authnotrequired => 1,
!         flagsrequired   => { borrow => 1 },
!     }
! );
! 
! my $bib_list     = $query->param('bib_list');
! my $email_add    = $query->param('email_add');
! my $email_sender = $query->param('email_sender');
  
- my $dbh = C4::Context->dbh();
  
  if ($email_add) {
!     my $email_from = C4::Context->preference('KohaAdminEmailAddress');
  
!     my %mail = (
!         To   => $email_add,
!         From => $email_from
!     );
! 
!     my ( $template2, $borrowernumber, $cookie ) = get_template_and_user(
!         {
!             template_name   => "opac-sendbasket.tmpl",
!             query           => $query,
!             type            => "opac",
!             authnotrequired => 1,
!             flagsrequired   => { borrow => 1 },
!         }
!     );
! 
!     my @bibs = split ( /\//, $bib_list );
!     my @results;
!     my $iso2709;
!     foreach my $biblionumber (@bibs) {
!         $template2->param( biblionumber => $biblionumber );
! 
!         my $dat = &bibdata($biblionumber);
!         my ( $authorcount, $addauthor ) = &addauthor($biblionumber);
!         my @items = &ItemInfo( undef, $biblionumber, 'opac' );
! 
!         $dat->{'additional'} = $addauthor->[0]->{'author'};
!         for ( my $i = 1 ; $i < $authorcount ; $i++ ) {
!             $dat->{'additional'} .= "|" . $addauthor->[$i]->{'author'};
!         }
! 
!         $dat->{'biblionumber'} = $biblionumber;
!         $dat->{ITEM_RESULTS} = address@hidden;
!         my $record = MARCgetbiblio( $dbh, $biblionumber );
!         $iso2709 .= $record->as_usmarc();
! 
!         push ( @results, $dat );
!     }
! 
!     my $resultsarray = address@hidden;
!     $template2->param(
!         BIBLIO_RESULTS => $resultsarray,
!         email_sender   => $email_sender
!     );
! 
!     # Getting template result
!     my $template_res = $template2->output();
! 
!     # Analysing information and getting mail properties
!     if ( $template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s ) {
!         $mail{'subject'} = $1;
!     }
!     else { $mail{'subject'} = "no subject"; }
! 
!     my $email_header = "";
!     if ( $template_res =~ /<HEADER>\n(.*)\n<END_HEADER>/s ) {
!         $email_header = $1;
!     }
! 
!     my $email_file = "basket.txt";
!     if ( $template_res =~ /<FILENAME>\n(.*)\n<END_FILENAME>/s ) {
!         $email_file = $1;
!     }
! 
!     if ( $template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s ) {
!         $mail{'body'} = $1;
!     }
  
!     my $boundary = "====" . time() . "====";
!     $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
  
      $email_header = encode_qp($email_header);
--- 16,73 ----
  my $query = new CGI;
  
! my ($template, $borrowernumber, $cookie) 
!     = get_template_and_user({template_name => "opac-sendbasketform.tmpl",
!                            query => $query,
!                            type => "opac",
!                            authnotrequired => 1,
!                            flagsrequired => {borrow => 1},
!                        });
! 
! my $bib_list=$query->param('bib_list');
! my $email_add=$query->param('email_add');
! my $email_sender=$query->param('email_sender');
! my $dbh=C4::Context->dbh;
! my $sth;
! $sth=$dbh->prepare("select bibid from marc_biblio where biblionumber=? order 
by bibid");
  
  
  if ($email_add) {
!       my $email_from = C4::Context->preference('KohaAdminEmailAddress');
! 
!       my %mail = (     To      => $email_add,
!                                                From    => $email_from);
  
!       my ($template2, $borrowernumber, $cookie) 
!     = get_template_and_user({template_name => "opac-sendbasket.tmpl",
!                            query => $query,
!                            type => "opac",
!                            authnotrequired => 1,
!                            flagsrequired => {borrow => 1},
!                        });
! 
!       my @bibs = split(/\//, $bib_list);
!       my @results;
!       my $iso2709;
!       foreach my $biblionumber (@bibs) {
!               $template2->param(biblionumber => $biblionumber);
! 
!               my $dat = &bibdata($biblionumber);
!               my ($authorcount, $addauthor) = &addauthor($biblionumber);
!               my @items                     = &ItemInfo(undef, $biblionumber, 
'opac');
! 
!               $dat->{'additional'}=$addauthor->[0]->{'author'};
!               for (my $i = 1; $i < $authorcount; $i++) {
!                       $dat->{'additional'} .= "|" . 
$addauthor->[$i]->{'author'};
!               }
! 
!               $dat->{'biblionumber'} = $biblionumber;
!               $dat->{ITEM_RESULTS} = address@hidden;
!               $sth->execute($biblionumber);
!               my ($bibid) = $sth->fetchrow;
!               my $record = MARCgetbiblio($dbh,$bibid);
!               $iso2709 .= $record->as_usmarc();
  
!               push (@results, $dat);
!       }
  
      $email_header = encode_qp($email_header);
***************
*** 108,113 ****
      $boundary = "--" . $boundary;
  
!     # Writing mail
!     $mail{body} = <<END_OF_BODY;
  $boundary
  Content-Type: text/plain; charset="iso-8859-1"
--- 75,129 ----
      $boundary = "--" . $boundary;
  
!       # Analysing information and getting mail properties
!       if ($template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s) { 
$mail{'subject'} = $1; }
!       else { $mail{'subject'} = "no subject"; }
! 
!       my $email_header = "";
!       if ($template_res =~ /<HEADER>\n(.*)\n<END_HEADER>/s) { $email_header = 
$1; }
! 
!       my $email_file = "basket.txt";
!       if ($template_res =~ /<FILENAME>\n(.*)\n<END_FILENAME>/s) { $email_file 
= $1; }
! 
!       if ($template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s) { $mail{'body'} 
= $1; }
! 
!       my $boundary = "====" . time() . "====";
! #     $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
! # 
! #     $email_header = encode_qp($email_header);
! # 
! #     $boundary = "--".$boundary;
! # 
! #     # Writing mail
! #     $mail{body} =
!       $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
! 
!       my $message = encode_qp( "" );
! 
! # $file = $^X; # This is the perl executable
! # 
! # open (F, $file) or die "Cannot read $file: $!";
! # binmode F; undef $/;
! $mail{body} = encode_base64($iso2709);
! # close F;
! 
! $boundary = '--'.$boundary;
! $mail{body} = <<END_OF_BODY;
! $boundary
! Content-Type: text/plain; charset="iso-8859-1"
! Content-Transfer-Encoding: quoted-printable
! 
! $message
! $boundary
! Content-Type: application/octet-stream; name="basket"
! Content-Transfer-Encoding: base64
! Content-Disposition: attachment; filename="basket"
! 
! $mail{body}
! $boundary--
! END_OF_BODY
! 
! 
! 
!        <<END_OF_BODY;
  $boundary
  Content-Type: text/plain; charset="iso-8859-1"
***************
*** 121,148 ****
  END_OF_BODY
  
!     # Sending mail
!     if ( sendmail %mail ) {
! 
!         # do something if it works....
!         warn "Mail sent ok\n";
!         $template->param( SENT      => "1" );
!         $template->param( email_add => $email_add );
!     }
!     else {
! 
!         # do something if it doesnt work....
!         warn "Error sending mail: $Mail::Sendmail::error \n";
!         warn "$mail{'body'}";
!     }
  
      output_html_with_http_headers $query, $cookie, $template->output;
  }
  else {
!     $template->param( bib_list => $bib_list );
!     $template->param(
!         url            => "/cgi-bin/koha/opac-sendbasket.pl",
!         suggestion     => C4::Context->preference("suggestion"),
!         virtualshelves => C4::Context->preference("virtualshelves"),
!     );
!     output_html_with_http_headers $query, $cookie, $template->output;
  }
--- 137,178 ----
  END_OF_BODY
  
! $mail{attachment} = $iso2709;
! #     $mail{body} = <<END_OF_BODY;
! #$boundary
! #Content-Type: text/plain; charset="iso-8859-1"
! #Content-Transfer-Encoding: quoted-printable
! #
! #$email_header
! #
! #$boundary
! #Content-Type: text/plain; name="$email_file"
! #Content-Transfer-Encoding: quoted-printable
! #Content-Disposition: attachment; filename="$email_file"
! #
! #$mail{'body'}
! #
! #$boundary--
! #END_OF_BODY
! 
!       # Sending mail
!       if (sendmail %mail) {
!       # do something if it works....
! #             warn " ".$mail{body};
! #             warn " ".$mail{PJ};
!               $template->param(SENT => "1");
!               $template->param(email_add => $email_add);
!       } else {
!               # do something if it doesnt work....
!               warn "Error sending mail: $Mail::Sendmail::error \n";
!       }
  
      output_html_with_http_headers $query, $cookie, $template->output;
  }
  else {
!       $template->param(bib_list => $bib_list);
!       $template->param(url => "/cgi-bin/koha/opac-sendbasket.pl",
!       suggestion => C4::Context->preference("suggestion"),
!       virtualshelves => C4::Context->preference("virtualshelves"),
!       );
!       output_html_with_http_headers $query, $cookie, $template->output;
  }

Index: opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-serial-issues.pl       4 May 2005 09:02:38 -0000       1.3
--- opac-serial-issues.pl       20 Jun 2005 14:33:32 -0000      1.4
***************
*** 15,41 ****
  my $op = $query->param('op');
  my $dbh = C4::Context->dbh;
  my $sth;
  # my $id;
  my ($template, $loggedinuser, $cookie);
  my $biblionumber = $query->param('biblionumber');
! my $subscriptions = get_subscription_list_from_biblionumber($biblionumber);
! 
! ($template, $loggedinuser, $cookie)
! = get_template_and_user({template_name => "opac-serial-issues.tmpl",
!                               query => $query,
!                               type => "opac",
!                               authnotrequired => 1,
!                               debug => 1,
!                               });
! 
! # replace CR by <br> in librarian note
! # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
! 
! $template->param(
!       biblionumber => $query->param('biblionumber'),
!       subscription_LOOP => $subscriptions
!       suggestion => C4::Context->preference("suggestion"),
!       virtualshelves => C4::Context->preference("virtualshelves"),
!       );
  
  output_html_with_http_headers $query, $cookie, $template->output;
--- 15,77 ----
  my $op = $query->param('op');
  my $dbh = C4::Context->dbh;
+ my $selectview = $query->param('selectview');
+ $selectview = C4::Context->preference("SubscriptionHistory") unless 
$selectview;
+ 
  my $sth;
  # my $id;
  my ($template, $loggedinuser, $cookie);
  my $biblionumber = $query->param('biblionumber');
! if ($selectview eq "full"){
!       my $subscriptions = 
get_full_subscription_list_from_biblionumber($biblionumber);
!       
!       my $title = $subscriptions->[0]{bibliotitle};
! #     warn "title ".$title;
!       my $yearmin=$subscriptions->[0]{year};
! #     warn "yearmin ".$yearmin;
!       my $yearmax=$subscriptions->[scalar(@$subscriptions)-1]{year};
! #     warn "yearmax ".$yearmax;
!       
!       
!       ($template, $loggedinuser, $cookie)
!       = get_template_and_user({template_name => 
"opac-full-serial-issues.tmpl",
!                                       query => $query,
!                                       type => "opac",
!                                       authnotrequired => 1,
!                                       debug => 1,
!                                       });
!       
!       # replace CR by <br> in librarian note
!       # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
!       
!       $template->param(
!               biblionumber => $query->param('biblionumber'),
!               years => $subscriptions,
!               yearmin => $yearmin,
!               yearmax =>$yearmax,
!               bibliotitle => $title,
!               suggestion => C4::Context->preference("suggestion"),
!               virtualshelves => C4::Context->preference("virtualshelves"),
!               );
  
+ } else {
+       my $subscriptions = 
get_subscription_list_from_biblionumber($biblionumber);
+       
+       ($template, $loggedinuser, $cookie)
+       = get_template_and_user({template_name => "opac-serial-issues.tmpl",
+                                       query => $query,
+                                       type => "opac",
+                                       authnotrequired => 1,
+                                       debug => 1,
+                                       });
+       
+       # replace CR by <br> in librarian note
+       # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
+       
+       $template->param(
+               biblionumber => $query->param('biblionumber'),
+               subscription_LOOP => $subscriptions,
+               suggestion => C4::Context->preference("suggestion"),
+               virtualshelves => C4::Context->preference("virtualshelves"),
+               );
+ }
  output_html_with_http_headers $query, $cookie, $template->output;

Index: opac-user.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** opac-user.pl        4 May 2005 09:02:38 -0000       1.16
--- opac-user.pl        20 Jun 2005 14:33:32 -0000      1.17
***************
*** 137,143 ****
  $template->param(WAITING => address@hidden);
  $template->param(waiting_count => $wcount,
!                            LibraryName => 
C4::Context->preference("LibraryName"),
!                                       suggestion => 
C4::Context->preference("suggestion"),
!                                       virtualshelves => 
C4::Context->preference("virtualshelves"),
  );
  
--- 137,144 ----
  $template->param(WAITING => address@hidden);
  $template->param(waiting_count => $wcount,
!                               LibraryName => 
C4::Context->preference("LibraryName"),
!                               suggestion => 
C4::Context->preference("suggestion"),
!                               virtualshelves => 
C4::Context->preference("virtualshelves"),
!                               textmessaging => $borr->{textmessaging},
  );