Changeset 75

Timestamp:

01.12.2006 03:32:23 (2 years ago)

Author:

jorge

Message:

Logging to file/stderr now behaves as described in FuzzyOcr?.cf

Files:

• trunk/devel/FuzzyOcr.pm (modified) (11 diffs)
• trunk/devel/FuzzyOcr/Config.pm (modified) (20 diffs)
• trunk/devel/FuzzyOcr/Deanimate.pm (modified) (4 diffs)
• trunk/devel/FuzzyOcr/Hashing.pm (modified) (11 diffs)
• trunk/devel/FuzzyOcr/Logging.pm (modified) (2 diffs)
• trunk/devel/FuzzyOcr/Misc.pm (modified) (4 diffs)

trunk/devel/FuzzyOcr.pm

@@ -70 +70 @@
-    if ($conf->{focr_global_timeout}) {
-        my $t = get_timeout();
-,2
+
-        $t->run(sub {
-            $end = fuzzyocr_do( $self, $conf, $pms );
@@ -121 +121 @@
-    my $main     = $self->{main};
-
-,2
+
-    foreach my $p (
-        $pms->{msg}->find_parts(qr(^image\b)i),
@@ -181 +181 @@
-            $imgfiles{$imgfilename}{ftype} = 1; 
-            ($w,$h) = unpack("vv",substr($pdata,6,4));
-debug
+info
-            $imgfiles{$imgfilename}{width}  = $w;
-            $imgfiles{$imgfilename}{height} = $h;
@@ -208 +208 @@
-            } else {
-                ($h,$w) = unpack("nn",substr($pdata,$pos+3,4));
-debug
+info
-                $imgfiles{$imgfilename}{ftype} = 2;
-                $imgfiles{$imgfilename}{height} = $h;
@@ -219 +219 @@
-            $imgfiles{$imgfilename}{width}  = $w;
-            $imgfiles{$imgfilename}{height} = $h;
-debug
+info
-        } elsif ( substr($pdata,0,2) eq "BM" ) {
-            ## BMP File
@@ -226 +226 @@
-            $imgfiles{$imgfilename}{width}  = $w;
-            $imgfiles{$imgfilename}{height} = $h;
-debug
+info
-        } elsif (
-            (substr($pdata,0,4) eq "\x4d\x4d\x00\x2a") or
@@ -241 +241 @@
-                last if ($h != 0 and $w != 0);
-            }
-debug
-debug
+info
+info
-            $imgfiles{$imgfilename}{ftype}  = 5;
-            $imgfiles{$imgfilename}{width}  = $w ? $w : 1;
@@ -259 +259 @@
-        print PICT $pdata;
-        close PICT;
-debug
+info
-        $cnt++;
-    }
@@ -278 +278 @@
-    # Try to load personal wordlist
-    if ($conf->{focr_personal_wordlist} =~ m/^\//) {
-        infolog("Attempting to load personal wordlist...");
-        read_words( $conf->{focr_personal_wordlist} );
-    } else {
@@ -285 +284 @@
-            read_words( $peruserlist );
-        } else {
-
+
+
+
+
-        }
-    }
@@ -658 +660 @@
-            }
-
- if ($conf->{focr_verbose}>2)
+
-
-            foreach my $ww (keys %words) {

trunk/devel/FuzzyOcr/Config.pm

@@ -3 +3 @@
-
-use lib qw(..);
-errorlog info
+infolog warnlog error
-use FuzzyOcr::Scanset;
-use FuzzyOcr::Preprocessor;
@@ -83 +83 @@
-sub set_pid {
-    $pid = shift;
-,2
+
-}
-
@@ -439 +439 @@
-    }
-
-    infolog("Adding <".scalar(@cmds)."> new options");
-    $conf->{parser}->register_commands(\@cmds);
-}
@@ -449 +448 @@
-        my $main = $self->{main};
-        my $retcode;
-        info("FuzzyOcr: focr_end_config");
-
-        # Parse preprocessor file
@@ -481 +479 @@
-                });
-            } else {
-error
+warn
-            }
-        }
@@ -504 +502 @@
-        my $b = "focr_bin_$a";
-        if (defined $conf->{$b} and ! -x $conf->{$b}) {
-error
+info
-            delete $conf->{$b};
-        } 
@@ -512 +510 @@
-            foreach my $p (@paths) {
-                my $f = "$p/$a";
-                debuglog("Testing $f...",2);
-                next unless -x $f;
-                $conf->{$b} = $f;
@@ -520 +517 @@
-                infolog("Using $a => $conf->{$b}");
-            } else {
-error
+warn
-            }
-        }
@@ -529 +526 @@
-        next unless $k =~ m/^focr_/;
-        next if $k =~ m/^focr_bin_/;
-,2
+
-    }
-
@@ -561 +558 @@
-        unless (HAS_DBI and HAS_DBD_MYSQL) {
-            $conf->{focr_enable_image_hashing} = 0;
-info
+error
-            errorlog("Missing DBI") unless HAS_DBI;
-            errorlog("Missing DBD::mysql") unless HAS_DBD_MYSQL;
@@ -569 +566 @@
-        unless (HAS_MLDBM and HAS_DB_FILE and HAS_STORABLE) {
-            $conf->{focr_enable_image_hashing} = 0;
-info
+error
-            errorlog("Missing MLDBM") unless HAS_MLDBM;
-            errorlog("Missing DB_File") unless HAS_DB_FILE;
@@ -590 +587 @@
-                    my $db = $DB{$k};
-                    if ($db->{check} < $now) {
-debug
+info
-                        delete $DB{$k}; $hash++;
-                    }
@@ -669 +666 @@
-                        }
-                        $sql .= ")";
-,2
+
-                        $ddb->do($sql); $err++;
-                    }
@@ -704 +701 @@
-                        }
-                        $sql .= ")";
-,2
+
-                        $ddb->do($sql); $err++;
-                    }
@@ -724 +721 @@
-    my $tfile = $_[1] || 'Personal';
-    unless ( -r $wfile ) {
-error
+warn
-        return;
-    }
@@ -752 +749 @@
-    my ($file) = @_;
-    unless (open(SFILE, "<$file")) {
-error
+warn
-        return 1;
-    }
@@ -769 +766 @@
-                next;
-            }
-,2
+
-            if ($_ =~ /^(\s)*preprocessors(\s)*=(\s)*(.*)$/i) {
-                my $prep = $4;
@@ -808 +805 @@
-        # Start a new scanset
-        } elsif ($_ =~ /^(\s)*scanset(\s)+(.+?)(\s)+\{$/i) {
-,2
+
-            if (grep $_ eq $3, @slabels) {
-                errorlog("Label already used earlier in line $., aborting...");
@@ -840 +837 @@
-        # We are in the middle of a preprocessor
-        if(defined $preprocessor) {
-,2
+
-            if ($_ =~ /^(\s)*(command|args)(\s)*=(\s)*(.*)$/i) {
-                my $tag = $2;
@@ -866 +863 @@
-        # Start a new preprocessor
-        } elsif ($_ =~ /^(\s)*preprocessor(\s)+(.+?)(\s)+\{$/i) {
-,2
+
-            if (grep $_ eq $3, @plabels) {
-                errorlog("Error, label already used earlier in line $., aborting...");

trunk/devel/FuzzyOcr/Deanimate.pm

@@ -8 +8 @@
-use FuzzyOcr::Config qw(get_config set_config get_tmpdir);
-use FuzzyOcr::Misc qw(save_execute);
-
+warnlog 
-
-# Provide functions to deanimate gifs
@@ -42 +42 @@
-            $tfile = $tfile3;
-        } else {
-error
+warn
-                ($retcode<0) ? 'Timed out' : 'Error'
-                ." [$retcode], image not reduced!");
@@ -53 +53 @@
-        ">>$efile");
-    return $tfile2 if ($retcode == 0);
-info
+warn
-    return $tfile;
-}
@@ -106 +106 @@
-                                  }sx;
-        if ($n != $frameno) {
-error
+warn
-                     . "  Expected 'image \#$frameno', found 'image \#$n', skipping..." );
-            $info{'error'}++;

trunk/devel/FuzzyOcr/Hashing.pm

@@ -10 +10 @@
-use FuzzyOcr::Config qw(get_thresholds get_config set_config get_tmpdir get_mysql_ddb);
-use FuzzyOcr::Misc qw(save_execute);
-
+warnlog 
-use Fcntl;
-use Fcntl ':flock';
@@ -59 +59 @@
-    my $conf = get_config();
-    if ($conf->{focr_enable_image_hashing} == 0) {
-info
+warn
-        return (0,'');
-    }
@@ -76 +76 @@
-    if ($conf->{focr_enable_image_hashing} == 3) {
-        unless (defined $conf->{focr_mysql_ddb}) {
-info
+warn
-            return (0,'');
-        }
@@ -145 +145 @@
-        tie %DB, 'MLDBM', $dbfile, O_RDWR or $ret++;
-        if ($ret>0) {
-error
+warn
-            return (0,'');
-        }
@@ -194 +194 @@
-        $ret = open HASH, $conf->{focr_digest_db};
-        unless($ret) {
-error
+warn
-            return (0,'');
-        }
@@ -219 +219 @@
-    if ($conf->{focr_enable_image_hashing} == 3) {
-        unless (defined $conf->{focr_mysql_ddb}) {
-info
+warn
-            return;
-        }
@@ -276 +276 @@
-        tie %DB, 'MLDBM', $dbfile or $ret++;
-        if ($ret>0) {
-error
+warn
-            return;
-        }
@@ -303 +303 @@
-        }
-        unless ($ret) {
-error
+warn
-            return;
-        }
@@ -313 +313 @@
-        close(DB);
-    }
-#
+
-}
-
@@ -334 +334 @@
-    unless (-r $pfile) {
-        errorlog("Cannot read $pfile");
-
+ 
-    }
-
-    my ($r, @stdout_data) = save_execute(
-
-
+
-        ">$imgdir/ppmhist.info",
-        ">/dev/null", 1);
@@ -368 +367 @@
-        }
-    }
-info
+debug
-    return(0, $hash);
-}

trunk/devel/FuzzyOcr/Logging.pm

@@ -2 +2 @@
-
-use base 'Exporter';
-
+warnlog 
-
-use Mail::SpamAssassin::Logger qw(log_message would_log);
@@ -34 +34 @@
-    
-sub errorlog {
+    _log("error",$_[0]) if $conf->{focr_log_stderr};
-    my $conf = FuzzyOcr::Config::get_config();
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-sub infolog {
-    my $conf = FuzzyOcr::Config::get_config();
-
-
+
+
+
+
+
-}
-
-sub debuglog {
-    my $conf = FuzzyOcr::Config::get_config();
-
-
-
-
-
-
-
+
+
+
+
-    }
-}

trunk/devel/FuzzyOcr/Misc.pm

@@ -7 +7 @@
-use lib qw(..);
-use FuzzyOcr::Config qw(set_pid unset_pid get_config get_timeout);
-
+warnlog 
-use Time::HiRes qw( gettimeofday tv_interval );
-
@@ -34 +34 @@
-        }
-    }
-info
+debug
-    unless(rmdir $dir) {
-        errorlog("Cannot remove DIR: $dir");
@@ -55 +55 @@
-            return -1;
-        } elsif (not $pid) {
-,2
-,2
-,2
-,2
+
+
+
+
-            if (defined $stdin) {
-                open(STDIN, $stdin);
@@ -94 +94 @@
-                return -1;
-            } elsif (not $pid) {
-,2
-,2
-,2
-,2
+
+
+
+
-                if (defined $stdin) {
-                    open(STDIN, $stdin);