svn commit: rev 37091 - in spamassassin/trunk/lib/Mail/SpamAssassin: . Message

[fe...@apache.org]

Author: felicity
Date: Thu Aug 26 10:13:13 2004
New Revision: 37091

Modified:
   spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata.pm
   spamassassin/trunk/lib/Mail/SpamAssassin/TextCat.pm
Log:
bug 3728: check_languages() wasn't able to find the languages hint file so it didn't run.

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata.pm	(original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata.pm	Thu Aug 26 10:13:13 2004
@@ -81,7 +81,7 @@
 
   # and identify the language (if we're going to do that), before we
   # run any Bayes tests, so they can use that as a token
-  $self->check_language($main->{conf});
+  $self->check_language($main);
 
   $main->call_plugins ("extract_metadata", { msg => $msg });
 }
@@ -95,9 +95,9 @@
 # ---------------------------------------------------------------------------
 
 sub check_language {
-  my ($self, $conf) = @_;
+  my ($self, $main) = @_;
 
-  my @languages = split (' ', $conf->{ok_languages});
+  my @languages = split (' ', $main->{conf}->{ok_languages});
   if (grep { $_ eq "all" } @languages) {
     # user doesn't care what lang it's in, so return.
     # TODO: might want to have them as bayes tokens all the same, though.
@@ -121,7 +121,7 @@
     return;
   }
 
-  my @matches = Mail::SpamAssassin::TextCat::classify($self, $body);
+  my @matches = Mail::SpamAssassin::TextCat::classify($self, $body, $main->{languages_filename});
   $self->{textcat_matches} = \@matches;
   my $matches_str = join(' ', @matches);
 

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/TextCat.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/TextCat.pm	(original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/TextCat.pm	Thu Aug 26 10:13:13 2004
@@ -49,7 +49,7 @@
 #         values are 1.05 or 1.1.
 
 sub classify {
-  my ($self, $input) = @_;
+  my ($self, $input, $languages_filename) = @_;
   my %results;
   my $maxp = $opt_t;
 
@@ -63,11 +63,11 @@
     my $rang = 1;
     dbg("Loading languages file...");
 
-    if (!defined $self->{main}->{languages_filename}) {
+    if (!defined $languages_filename) {
       return;
     }
 
-    open(LM, $self->{main}->{languages_filename})
+    open(LM, $languages_filename)
 	|| die "cannot open languages: $!\n";
     local $/ = undef;
     @lm = split(/\n/, <LM>);