View | Details | Raw Unified | Return to bug 40934
Collapse All | Expand All

(-)a/C4/Letters.pm (+7 lines)
Lines 1077-1082 sub SendQueuedMessages { Link Here
1077
            ref( $params->{letter_code} )
1077
            ref( $params->{letter_code} )
1078
                && @{ $params->{letter_code} } ? ( letter_code => $params->{letter_code} ) : (),
1078
                && @{ $params->{letter_code} } ? ( letter_code => $params->{letter_code} ) : (),
1079
            !ref( $params->{letter_code} ) && $params->{letter_code} ? ( letter_code => $params->{letter_code} ) : (),
1079
            !ref( $params->{letter_code} ) && $params->{letter_code} ? ( letter_code => $params->{letter_code} ) : (),
1080
1081
            # Check for scalar or array in exclude_letter_code
1082
            ref( $params->{exclude_letter_code} )
1083
                && @{ $params->{exclude_letter_code} } ? ( letter_code => { '-not_in' => $params->{exclude_letter_code} } ) : (),
1084
            !ref( $params->{exclude_letter_code} )
1085
                && $params->{exclude_letter_code} ? ( letter_code => { '!=' => $params->{exclude_letter_code} } ) : (),
1086
1080
            ref( $params->{type} )
1087
            ref( $params->{type} )
1081
                && @{ $params->{type} }
1088
                && @{ $params->{type} }
1082
            ? ( message_transport_type => $params->{type} )
1089
            ? ( message_transport_type => $params->{type} )
(-)a/misc/cronjobs/process_message_queue.pl (-1 / +5 lines)
Lines 35-40 my $verbose = 0; Link Here
35
my $where;
35
my $where;
36
my @type;
36
my @type;
37
my @letter_code;
37
my @letter_code;
38
my @exclude_letter_code;
38
my $exit_on_plugin_failure = 0;
39
my $exit_on_plugin_failure = 0;
39
40
40
my $command_line_options = join( " ", @ARGV );
41
my $command_line_options = join( " ", @ARGV );
Lines 49-54 GetOptions( Link Here
49
    'v|verbose'                => \$verbose,
50
    'v|verbose'                => \$verbose,
50
    't|type:s'                 => \@type,
51
    't|type:s'                 => \@type,
51
    'c|code:s'                 => \@letter_code,
52
    'c|code:s'                 => \@letter_code,
53
    'x|exclude-code:s'         => \@exclude_letter_code,
52
    'w|where:s'                => \$where,
54
    'w|where:s'                => \$where,
53
    'e|exit-on-plugin-failure' => \$exit_on_plugin_failure,
55
    'e|exit-on-plugin-failure' => \$exit_on_plugin_failure,
54
);
56
);
Lines 65-70 This script has the following parameters : Link Here
65
    -p --password: password of mail account
67
    -p --password: password of mail account
66
    -t --type: If supplied, only processes this type of message ( email, sms ), repeatable
68
    -t --type: If supplied, only processes this type of message ( email, sms ), repeatable
67
    -c --code: If supplied, only processes messages with this letter code, repeatable
69
    -c --code: If supplied, only processes messages with this letter code, repeatable
70
    -x --exclude-code: If supplied, processes all messages except those with this letter code, repeatable
68
    -l --limit: The maximum number of messages to process for this run
71
    -l --limit: The maximum number of messages to process for this run
69
    -m --method: authentication method required by SMTP server (See perldoc Sendmail.pm for supported authentication types.)
72
    -m --method: authentication method required by SMTP server (See perldoc Sendmail.pm for supported authentication types.)
70
    -h --help: this message
73
    -h --help: this message
Lines 89-94 try { Link Here
89
92
90
# Remove empty elements, see bug 37075
93
# Remove empty elements, see bug 37075
91
@letter_code = grep { $_ ne q{} } @letter_code;
94
@letter_code = grep { $_ ne q{} } @letter_code;
95
@exclude_letter_code = grep { $_ ne q{} } @exclude_letter_code;
92
96
93
C4::Letters::SendQueuedMessages(
97
C4::Letters::SendQueuedMessages(
94
    {
98
    {
Lines 99-104 C4::Letters::SendQueuedMessages( Link Here
99
        limit                  => $limit,
103
        limit                  => $limit,
100
        type                   => \@type,
104
        type                   => \@type,
101
        letter_code            => \@letter_code,
105
        letter_code            => \@letter_code,
106
        exclude_letter_code    => \@exclude_letter_code,
102
        where                  => $where,
107
        where                  => $where,
103
        exit_on_plugin_failure => $exit_on_plugin_failure,
108
        exit_on_plugin_failure => $exit_on_plugin_failure,
104
    }
109
    }
105
- 

Return to bug 40934