svn commit: r1844019 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TextCat.pm

[he...@apache.org]

Author: hege
Date: Tue Oct 16 15:11:50 2018
New Revision: 1844019

URL: http://svn.apache.org/viewvc?rev=1844019&view=rev
Log:
Handle missing languages file better

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TextCat.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TextCat.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TextCat.pm?rev=1844019&r1=1844018&r2=1844019&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TextCat.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TextCat.pm Tue Oct 16 15:11:50 2018
@@ -71,6 +71,7 @@ sub new {
   if (! @nm) {
     if (!defined $mailsaobject->{languages_filename}) {
       warn "textcat: languages filename not defined\n";
+      $self->{textcat_disabled} = 1;
     }
     else {
       load_models($mailsaobject->{languages_filename});
@@ -522,6 +523,8 @@ sub create_lm {
 sub extract_metadata {
   my ($self, $opts) = @_;
 
+  return if $self->{textcat_disabled};
+
   my $msg = $opts->{msg};
 
   my $body = $msg->get_rendered_body_text_array();
@@ -563,6 +566,8 @@ sub extract_metadata {
 sub check_language {
   my ($self, $scan) = @_;
 
+  return 0 if $self->{textcat_disabled};
+
   my $msg = $scan->{msg};
 
   my @languages = split(' ', $scan->{conf}->{ok_languages});
@@ -603,6 +608,8 @@ sub check_language {
 sub check_body_8bits {
   my ($self, $scan, $body) = @_;
 
+  return 0 if $self->{textcat_disabled};
+
   my @languages = split(' ', $scan->{conf}->{ok_languages});
 
   for (@languages) {