Changeset 99

Timestamp:

09.12.2006 21:14:16 (2 years ago)

Author:

decoder

Message:

Fix: $haserr defined before for loop starts (Jorge, please check if that is correct like that :))
Fix: Removed LOCK_UN calls for all files, they are not needed and dangerous as I read now. closing the FH is enough
New dependency: MLDBM::Sync (to get proper locking for MLDBM)
Fix: MLDBM access now with Locking, to prevent database corruption or failure.

Files:

• trunk/devel/FuzzyOcr.pm (modified) (2 diffs)
• trunk/devel/FuzzyOcr/Config.pm (modified) (13 diffs)
• trunk/devel/FuzzyOcr/Hashing.pm (modified) (5 diffs)
• trunk/devel/FuzzyOcr/Logging.pm (modified) (1 diff)

trunk/devel/FuzzyOcr.pm

@@ -308 +308 @@
-
-    IMAGE:
+    my $haserr;
-    foreach my $filename (keys %imgfiles) {
-        my $pic = $imgfiles{$filename};
@@ -324 +325 @@
-
-        #Open ERRORLOG
-my 
+
-
-        if ($haserr) {

trunk/devel/FuzzyOcr/Config.pm

@@ -7 +7 @@
-use FuzzyOcr::Preprocessor;
-use Mail::SpamAssassin::Logger;
+
+use Fcntl qw(O_RDWR O_CREAT);
-
-use base 'Exporter';
@@ -28 +30 @@
-    get_wordlist 
-    get_mysql_ddb
+    get_db_ref
+    set_db_ref
-    read_words 
-    /;
@@ -33 +37 @@
-use constant HAS_DBI => eval { require DBI; };
-use constant HAS_DBD_MYSQL => eval { require DBD::mysql; };
-
+require MLDBM::Sync; 
-use constant HAS_DB_FILE => eval { require DB_File; };
-use constant HAS_STORABLE => eval { require Storable; };
@@ -49 +53 @@
-our $tmpdir;
-our @tmpdirs;
+our $dbref;
-
-our @bin_utils = qw/gifsicle
@@ -141 +146 @@
-sub get_thresholds {
-    return \%Threshold;
+}
+
+sub set_db_ref {
+    $dbref = shift;
+}
+
+sub get_db_ref {
+    return $dbref;
-}
-
@@ -616 +629 @@
-            $conf->{focr_enable_image_hashing} = 0;
-            errorlog("Disable Image Hashing");
-
+ and/or MLDBM::Sync
-            errorlog("Missing DB_File") unless HAS_DB_FILE;
-            errorlog("Missing Storable") unless HAS_STORABLE;
@@ -624 +637 @@
-        use DBI;
-        use MLDBM qw(DB_File Storable);
+        use MLDBM::Sync;
-        if ($conf->{focr_enable_image_hashing} == 2 and -r $conf->{focr_digest_db}) {
-
+sdbm; my $
-            my $now = time - ($conf->{focr_db_max_days}*86400);
-tie %DB, 'MLDBM
+$sdbm = tie %DB, 'MLDBM::Sync
-            if ($err) {
-                errorlog("Could not open \"$conf->{focr_db_hash}\"");
-            } else {
+                $sdbm->Lock;
-                my $hash = 0;
-                infolog("Expiring records prior to: ".scalar(localtime($now)));
@@ -662 +677 @@
-                $hash = scalar(keys %DB);
-                infolog("<$hash> Known BAD Image Hashes Available");
+                $sdbm->UnLock;
-                untie %DB;
-            }
-            $err = 0;
-tie %DB, 'MLDBM
+$sdbm = tie %DB, 'MLDBM::Sync
-            if ($err) {
-                errorlog("Could not open \"$conf->{focr_db_safe}\"");
-            } else {
+                $sdbm->Lock;
-                my $hash = 0;
-                foreach my $k (keys %DB) {
@@ -681 +698 @@
-                $hash = scalar(keys %DB);
-                infolog("<$hash> Known GOOD Image Hashes Available");
+                $sdbm->UnLock;
-                untie %DB;
-            }
@@ -688 +706 @@
-            my $tab  = $conf->{focr_mysql_hash};
-            my $file = $conf->{focr_db_hash};
-
-tie %DB, 'MLDBM
+sdbm; my $
+$sdbm = tie %DB, 'MLDBM::Sync
-            if ($err) {
-                errorlog("Could not open \"$file\"");
-            } else {
+                $sdbm->ReadLock;
-                foreach my $k (keys %DB) {
-                    my $dbm = $DB{$k};
@@ -718 +737 @@
-                    }
-                }
+                $sdbm->UnLock;
-                untie %DB;
-                infolog("Stored [$err] Hashes in $db.$tab") if $err>0;
@@ -724 +744 @@
-            $file = $conf->{focr_db_safe};
-            $err  = 0;
-tie %DB, 'MLDBM
+$sdbm = tie %DB, 'MLDBM::Sync
-            if ($err) {
-                errorlog("Could not open \"$file\"");
-            } else {
+                $sdbm->ReadLock;
-                foreach my $k (keys %DB) {
-                    my $dbm = $DB{$k};
@@ -753 +774 @@
-                    }
-                }
+                $sdbm->UnLock;
-                untie %DB;
-                infolog("Stored [$err] Hashes in $db.$tab") if $err>0;

trunk/devel/FuzzyOcr/Hashing.pm

@@ -142 +142 @@
-    elsif ($conf->{focr_enable_image_hashing} == 2) {
-        use MLDBM qw(DB_File Storable);
-
-
+
+
+
-        if ($ret>0) {
-            warnlog("No Image Hash database found at \"$dbfile\", or permissions wrong.");
-            return (0,'');
-        }
+        $sdbm->Lock;
-        if (defined $DB{$key}) {
-            $dbm = $DB{$key};
@@ -188 +190 @@
-            $DB{$key} = $dbm;
-        }
+        $sdbm->UnLock;
-        untie %DB;
-        return ($ret,$dinfo);
@@ -272 +275 @@
-    elsif ($conf->{focr_enable_image_hashing} == 2) {
-        use MLDBM qw(DB_File Storable);
+        use MLDBM::Sync;
-        my $dbfile = $_[2] || $conf->{focr_db_hash};
-
-tie %DB, 'MLDBM
+ my $sdbm;
+$sdbm = tie %DB, 'MLDBM::Sync
-        if ($ret>0) {
-            warnlog("Unable to open/create Image Hash database at \"$dbfile\", check permissions.");
-            return;
-        }
+        $sdbm->Lock;
-        infolog("Adding Hash to \"$dbfile\" with score \"$score\"");
-        my ($img,$key) = split('::',$digest,2);
@@ -294 +299 @@
-            $DB{$key} = $dbm;
-        }
+        $sdbm->UnLock;
-        untie %DB;
-    }
@@ -310 +316 @@
-        seek( DB, 0, 2 );
-        print DB "${score}::${digest}\n";
-        flock( DB, LOCK_UN );
-        close(DB);
-    }

trunk/devel/FuzzyOcr/Logging.pm

@@ -22 +22 @@
-    seek( LOGFILE, 0, 2 );
-    print LOGFILE "$time [$$] $logtext\n";
-    flock( LOGFILE, LOCK_UN );
-    close LOGFILE;
-}