Marcel de Rooy
caae161a4e
This patch includes: [1] Add some logic to GetMarcNotes to embed the contents of MARC21 field 555$u in a html anchor tag. [2] Add a unit test for GetMarcNotes in Biblio.t [3] Remove calls to GetMarcNotes from sendbasket.pl (opac and staff). A closer look revealed that the data was not used; the notes in the mail of sendbasket are taken from GetBiblioData. Test plan: [1] Edit a record. Add one or two URLS in 555$u. Add something in 500$a too. [2] Check if you can click the URLs in opac and staff detail tab Notes or Descriptions. [3] Run the unit test t/db../Biblio.t [4] Add something in the cart. Click More Details and send the cart. Verify that you have something in Notes (from 500$a). Signed-off-by: Marc Veron <veron@veron.ch> Followed test plan. Works as expected. QA tools OK. Tested with all patches together, works as expected Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
178 lines
5.2 KiB
Perl
Executable file
178 lines
5.2 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
use CGI qw ( -utf8 );
|
|
use Encode qw(encode);
|
|
use Carp;
|
|
|
|
use Mail::Sendmail;
|
|
use MIME::QuotedPrint;
|
|
use MIME::Base64;
|
|
use C4::Biblio;
|
|
use C4::Items;
|
|
use C4::Auth;
|
|
use C4::Output;
|
|
use C4::Biblio;
|
|
use Koha::Email;
|
|
|
|
my $query = new CGI;
|
|
|
|
my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
|
|
{
|
|
template_name => "basket/sendbasketform.tt",
|
|
query => $query,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { catalogue => 1 },
|
|
}
|
|
);
|
|
|
|
my $bib_list = $query->param('bib_list');
|
|
my $email_add = $query->param('email_add');
|
|
|
|
my $dbh = C4::Context->dbh;
|
|
|
|
if ( $email_add ) {
|
|
my $email = Koha::Email->new();
|
|
my %mail = $email->create_message_headers({ to => $email_add });
|
|
my $comment = $query->param('comment');
|
|
my ( $template2, $borrowernumber, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "basket/sendbasket.tt",
|
|
query => $query,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { borrow => 1 },
|
|
}
|
|
);
|
|
|
|
my @bibs = split( /\//, $bib_list );
|
|
my @results;
|
|
my $iso2709;
|
|
my $marcflavour = C4::Context->preference('marcflavour');
|
|
foreach my $biblionumber (@bibs) {
|
|
$template2->param( biblionumber => $biblionumber );
|
|
|
|
my $dat = GetBiblioData($biblionumber);
|
|
next unless $dat;
|
|
my $record = GetMarcBiblio($biblionumber, 1);
|
|
my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
|
|
my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
|
|
|
|
my @items = GetItemsInfo( $biblionumber );
|
|
|
|
my $hasauthors = 0;
|
|
if($dat->{'author'} || @$marcauthorsarray) {
|
|
$hasauthors = 1;
|
|
}
|
|
|
|
|
|
$dat->{MARCSUBJCTS} = $marcsubjctsarray;
|
|
$dat->{MARCAUTHORS} = $marcauthorsarray;
|
|
$dat->{HASAUTHORS} = $hasauthors;
|
|
$dat->{'biblionumber'} = $biblionumber;
|
|
$dat->{ITEM_RESULTS} = \@items;
|
|
|
|
$iso2709 .= $record->as_usmarc();
|
|
|
|
push( @results, $dat );
|
|
}
|
|
|
|
my $resultsarray = \@results;
|
|
$template2->param(
|
|
BIBLIO_RESULTS => $resultsarray,
|
|
comment => $comment
|
|
);
|
|
|
|
# Getting template result
|
|
my $template_res = $template2->output();
|
|
my $body;
|
|
|
|
# Analysing information and getting mail properties
|
|
if ( $template_res =~ /<SUBJECT>(.*)<END_SUBJECT>/s ) {
|
|
$mail{subject} = $1;
|
|
$mail{subject} =~ s|\n?(.*)\n?|$1|;
|
|
$mail{subject} = Encode::encode("UTF-8", $mail{subject});
|
|
}
|
|
else { $mail{'subject'} = "no subject"; }
|
|
|
|
my $email_header = "";
|
|
if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
|
|
$email_header = $1;
|
|
$email_header =~ s|\n?(.*)\n?|$1|;
|
|
$email_header = encode_qp(Encode::encode("UTF-8", $email_header));
|
|
}
|
|
|
|
my $email_file = "basket.txt";
|
|
if ( $template_res =~ /<FILENAME>(.*)<END_FILENAME>/s ) {
|
|
$email_file = $1;
|
|
$email_file =~ s|\n?(.*)\n?|$1|;
|
|
}
|
|
|
|
if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
|
|
$body = $1;
|
|
$body =~ s|\n?(.*)\n?|$1|;
|
|
$body = encode_qp(Encode::encode("UTF-8", $body));
|
|
}
|
|
|
|
my $boundary = "====" . time() . "====";
|
|
|
|
# Writing mail
|
|
$mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
|
|
my $isofile = encode_base64(encode("UTF-8", $iso2709));
|
|
$boundary = '--' . $boundary;
|
|
$mail{body} = <<END_OF_BODY;
|
|
$boundary
|
|
Content-Type: text/plain; charset="utf-8"
|
|
Content-Transfer-Encoding: quoted-printable
|
|
|
|
$email_header
|
|
$body
|
|
$boundary
|
|
Content-Type: application/octet-stream; name="basket.iso2709"
|
|
Content-Transfer-Encoding: base64
|
|
Content-Disposition: attachment; filename="basket.iso2709"
|
|
|
|
$isofile
|
|
$boundary--
|
|
END_OF_BODY
|
|
|
|
# Sending mail
|
|
if ( sendmail %mail ) {
|
|
# do something if it works....
|
|
$template->param( SENT => "1" );
|
|
}
|
|
else {
|
|
# do something if it doesnt work....
|
|
carp "Error sending mail: $Mail::Sendmail::error \n";
|
|
$template->param( error => 1 );
|
|
}
|
|
$template->param( email_add => $email_add );
|
|
output_html_with_http_headers $query, $cookie, $template->output;
|
|
}
|
|
else {
|
|
$template->param( bib_list => $bib_list );
|
|
$template->param(
|
|
url => "/cgi-bin/koha/basket/sendbasket.pl",
|
|
suggestion => C4::Context->preference("suggestion"),
|
|
virtualshelves => C4::Context->preference("virtualshelves"),
|
|
);
|
|
output_html_with_http_headers $query, $cookie, $template->output;
|
|
}
|