Changeset 45

Timestamp:

21.11.2006 00:51:34 (2 years ago)

Author:

jorge

Message:

If using image hashing, check that required perl modules are available, or disable hashing and send a message to the logger why hashing was disabled and which modules are missing.
This should make the plugin work even though we do not have the required parameters for the optional hashing database.

Files:

• trunk/devel/FuzzyOcr/Config.pm (modified) (4 diffs)
• trunk/devel/FuzzyOcr/Hashing.pm (modified) (5 diffs)

trunk/devel/FuzzyOcr/Config.pm

@@ -19 +19 @@
-use Mail::SpamAssassin::Logger;
-use Fcntl ':flock';
-
+
+
+
+
+
+
-
-#Defines the defaults and reads the configuration and wordlists
@@ -81 +86 @@
-
-sub get_ddb {
+    return undef unless (HAS_DBI and HAS_DBD_MYSQL);
-    my $conf = get_config();
-    my %dopts = ( AutoCommit => 1 );
@@ -366 +372 @@
-    }
-
+    if ($conf->{focr_enable_image_hashing} == 3) {
+        unless (HAS_DBI and HAS_DBD_MYSQL) {
+            $conf->{focr_enable_image_hashing} = 0;
+            debuglog("Disable Image Hashing");
+            debuglog("Missing DBI") unless HAS_DBI;
+            debuglog("Missing DBD::mysql") unless HAS_DBD_MYSQL;
+        }
+    }
+    if ($conf->{focr_enable_image_hashing} == 2) {
+        unless (HAS_MLDBM and HAS_DB_FILE and HAS_STORABLE) {
+            $conf->{focr_enable_image_hashing} = 0;
+            debuglog("Disable Image Hashing");
+            debuglog("Missing MLDBM") unless HAS_MLDBM;
+            debuglog("Missing DB_File") unless HAS_DB_FILE;
+            debuglog("Missing Storable") unless HAS_STORABLE;
+        }
+    }
-    if ($conf->{focr_enable_image_hashing} == 2 and -r $conf->{focr_digest_db}) {
-        my %DB; my $dbm; my $err = 0;
@@ -429 +452 @@
-    if ($conf->{focr_enable_image_hashing} == 3) {
-        my $ddb = $conf->{focr_ddb} = get_ddb();
-conf->{focr_ddb}
+ddb
-            my $db   = $conf->{focr_mysql_db};
-            my $tab  = $conf->{focr_mysql_hash};

trunk/devel/FuzzyOcr/Hashing.pm

@@ -9 +9 @@
-use lib "../";
-use FuzzyOcr::Config qw(get_thresholds get_config set_config debuglog logfile);
-use DBI;
-use MLDBM qw(DB_File Storable);
-use Fcntl;
-use Fcntl ':flock';
@@ -60 +58 @@
-    return (0,'') if (
-        ($conf->{focr_enable_image_hashing} == 0) or
-
+$conf->{focr_enable_image_hashing} == 3 and 
-    );
-    my $digest = $_[0];
@@ -134 +132 @@
-    }
-    elsif ($conf->{focr_enable_image_hashing} == 2) {
+        use MLDBM qw(DB_File Storable);
-        my %DB = (); my $dbm;
-        tie %DB, 'MLDBM', $dbfile, O_RDWR or $ret++;
@@ -242 +241 @@
-    }
-    elsif ($conf->{focr_enable_image_hashing} == 2) {
+        use MLDBM qw(DB_File Storable);
-        my $dbfile = $_[2] || $conf->{focr_db_hash};
-        my %DB = ();
@@ -341 +341 @@
-    my $ret;
-
-    debuglog("fmt_time: When =  $when");
-    if ($when>86400) {
-        my $d = int($when/86400);