svn commit: r391117 - /spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/TextCat.pm

[fe...@apache.org]

Author: felicity
Date: Mon Apr  3 11:49:38 2006
New Revision: 391117

URL: http://svn.apache.org/viewcvs?rev=391117&view=rev
Log:
bug 4830: remove die() calls in TextCat plugin

Modified:
    spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/TextCat.pm

Modified: spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/TextCat.pm
URL: http://svn.apache.org/viewcvs/spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/TextCat.pm?rev=391117&r1=391116&r2=391117&view=diff
==============================================================================
--- spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/TextCat.pm (original)
+++ spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/TextCat.pm Mon Apr  3 11:49:38 2006
@@ -85,8 +85,12 @@
 
   # load language models once
   if (! @nm) {
-    # load_models will die() if it fails
-    load_models($mailsaobject->{languages_filename});
+    if (!defined $mailsaobject->{languages_filename}) {
+      warn "textcat: languages filename not defined\n";
+    }
+    else {
+      load_models($mailsaobject->{languages_filename});
+    }
   }
 
   $self->register_eval_rule("check_language");
@@ -316,12 +320,11 @@
   my $rang = 1;
   dbg("textcat: loading languages file...");
 
-  if (!defined $languages_filename) {
-    die "textcat: languages filename not defined";
+  if (!open(LM, $languages_filename)) {
+    warn "textcat: cannot open languages file: $!\n";
+    return;
   }
 
-  open(LM, $languages_filename)
-      || die "textcat: cannot open languages: $!\n";
   local $/ = undef;
   @lm = split(/\n/, <LM>);
   close(LM);
@@ -340,9 +343,11 @@
     }
   }
   if (! @nm) {
-    die "textcat: no language models loaded";
+    warn "textcat: no language models loaded\n";
+  }
+  else {
+    dbg("textcat: loaded " . scalar(@nm) . " language models");
   }
-  dbg("textcat: loaded " . scalar(@nm) . " language models");
 }
 
 sub classify {