ffzg/recall_notices.pl: added --interval and --dedup

[koha.git] / opac / opac-sendshelf.pl

diff --git a/opac/opac-sendshelf.pl b/opac/opac-sendshelf.pl
index e58ce7c..a5b393e 100755 (executable)
--- a/opac/opac-sendshelf.pl
+++ b/opac/opac-sendshelf.pl
@@ -17,8 +17,7 @@
 # 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 qw ( -utf8 );
 use Encode qw( encode );
@@ -80,6 +79,9 @@ if ( $email ) {
         }
     );
 
+    my $patron = Koha::Patrons->find( $borrowernumber );
+    my $borcat = $patron ? $patron->categorycode : q{};
+
     my $shelf = Koha::Virtualshelves->find( $shelfid );
     my $contents = $shelf->get_contents;
     my $marcflavour         = C4::Context->preference('marcflavour');
@@ -88,9 +90,15 @@ if ( $email ) {
 
     while ( my $content = $contents->next ) {
         my $biblionumber = $content->biblionumber;
+        my $record           = GetMarcBiblio({
+            biblionumber => $biblionumber,
+            embed_items  => 1,
+            opac         => 1,
+            borcat       => $borcat });
+        next unless $record;
         my $fw               = GetFrameworkCode($biblionumber);
         my $dat              = GetBiblioData($biblionumber);
-        my $record           = GetMarcBiblio($biblionumber, 1);
+
         my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
         my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
         my $subtitle         = GetRecordValue('subtitle', $record, $fw);
@@ -110,8 +118,6 @@ if ( $email ) {
         push( @results, $dat );
     }
 
-    my $patron = Koha::Patrons->find( $borrowernumber );
-
     $template2->param(
         BIBLIO_RESULTS => \@results,
         comment        => $comment,
@@ -130,7 +136,7 @@ if ( $email ) {
         $mail{subject} =~ s|\n?(.*)\n?|$1|;
     }
     else { $mail{'subject'} = "no subject"; }
-    $mail{subject} = Encode::encode("UTF-8", $mail{subject});
+    $mail{subject} = encode('MIME-Header', $mail{subject});
 
     my $email_header = "";
     if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
@@ -182,7 +188,7 @@ END_OF_BODY
         $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 );
     }