#
# 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 2 of the License, or (at your option) any later
-# version.
+# 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.
+# 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, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# 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 Modern::Perl;
-use CGI;
-use Encode qw(decode encode);
+use CGI qw ( -utf8 );
+use Encode qw( encode );
use Carp;
use Mail::Sendmail;
use C4::Biblio;
use C4::Items;
use C4::Output;
-use C4::VirtualShelves;
use Koha::Email;
+use Koha::Virtualshelves;
my $query = new CGI;
}
);
- my @shelf = GetShelf($shelfid);
- my ( $items, $totitems ) = GetShelfContents($shelfid);
+ my $shelf = Koha::Virtualshelves->find( $shelfid );
+ my $contents = $shelf->get_contents;
my $marcflavour = C4::Context->preference('marcflavour');
my $iso2709;
my @results;
- # retrieve biblios from shelf
- foreach my $biblio (@$items) {
- my $biblionumber = $biblio->{biblionumber};
+ while ( my $content = $contents->next ) {
+ my $biblionumber = $content->biblionumber;
my $fw = GetFrameworkCode($biblionumber);
my $dat = GetBiblioData($biblionumber);
- my $record = GetMarcBiblio($biblionumber);
- my $marcnotesarray = GetMarcNotes( $record, $marcflavour );
+ my $record = GetMarcBiblio({
+ biblionumber => $biblionumber,
+ embed_items => 1 });
my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
my $subtitle = GetRecordValue( 'subtitle', $record, $fw );
my @items = GetItemsInfo($biblionumber);
- $dat->{MARCNOTES} = $marcnotesarray;
+ $dat->{ISBN} = GetMarcISBN($record, $marcflavour);
$dat->{MARCSUBJCTS} = $marcsubjctsarray;
$dat->{MARCAUTHORS} = $marcauthorsarray;
$dat->{'biblionumber'} = $biblionumber;
$dat->{ITEM_RESULTS} = \@items;
$dat->{subtitle} = $subtitle;
+ $dat->{HASAUTHORS} = $dat->{'author'} || @$marcauthorsarray;
$iso2709 .= $record->as_usmarc();
push( @results, $dat );
}
- if ( C4::Context->preference('OPACBaseURL') ) {
- $template2->param(
- OPACBaseURL => C4::Context->preference('OPACBaseURL') );
- }
-
$template2->param(
BIBLIO_RESULTS => \@results,
- email_sender => $mail{'from'},
comment => $comment,
- shelfname => $shelf[1],
+ shelfname => $shelf->shelfname,
);
# Getting template result
# Analysing information and getting mail properties
if ( $template_res =~ /<SUBJECT>(.*)<END_SUBJECT>/s ) {
- $mail{subject} = $1;
+ $mail{'subject'} = Encode::encode("UTF-8", $1);
$mail{subject} =~ s|\n?(.*)\n?|$1|;
}
else { $mail{'subject'} = "no subject"; }
if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
$email_header = $1;
$email_header =~ s|\n?(.*)\n?|$1|;
- $email_header = encode_qp($email_header);
+ $email_header = encode_qp(Encode::encode("UTF-8", $email_header));
}
my $email_file = "list.txt";
if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
$body = $1;
$body =~ s|\n?(.*)\n?|$1|;
- $body = encode_qp($body);
+ $body = encode_qp(Encode::encode("UTF-8", $body));
}
my $boundary = "====" . time() . "====";
$template->param( SENT => "1" );
}
else {
- # do something if it doesnt work....
+ # do something if it doesn't work....
carp "Error sending mail: $Mail::Sendmail::error \n";
$template->param( error => 1 );
}