Changeset 84

Timestamp:

04.12.2006 13:05:09 (2 years ago)

Author:

decoder

Message:

Fixed: Mysql password no longer shown in debug output
Added: FuzzyOcr? now re-checks the score before doing OCR (i.e. if original score + score by other FuzzyOcr? tests > autodisable score, then skip OCR
as well)

Files:

• trunk/devel/FuzzyOcr.pm (modified) (9 diffs)
• trunk/devel/FuzzyOcr/Config.pm (modified) (1 diff)

trunk/devel/FuzzyOcr.pm

@@ -99 +99 @@
-    my ( $self, $conf, $pms ) = @_;
-
+    my $internal_score = 0;
-    my $current_score = $pms->get_score();
-    my $score = $conf->{focr_autodisable_score} || 100;
@@ -334 +335 @@
-            if ( ($$pic{ctype} !~ /gif/i) and not $generic_ctype) {
-                wrong_ctype( "GIF", $$pic{ctype} );
+                $internal_score += $conf->{'focr_wrongctype_score'};
-            }
-
-            if ( $suffix and $suffix !~ /gif/i) {
-                wrong_extension( "GIF", $suffix);
+                $internal_score += $conf->{'focr_wrongext_score'};
-            }
-
@@ -406 +409 @@
-                    infolog("Skipping corrupted interlaced image...");
-                    corrupt_img($conf->{focr_corrupt_unfixable_score}, $corrupt);
+                    $internal_score += $conf->{focr_corrupt_unfixable_score};
-                    next;
-                }
@@ -411 +415 @@
-                    infolog("Uncorrectable corruption detected, skipping non-interlaced image...");
-                    corrupt_img($conf->{focr_corrupt_unfixable_score}, $corrupt);
+                    $internal_score += $conf->{focr_corrupt_unfixable_score};
-                    next;
-                }
-                infolog("Image is corrupt, but seems fixable, continuing...");
-                corrupt_img($conf->{focr_corrupt_score}, $corrupt);
+                $internal_score += $conf->{focr_corrupt_score};
-            }
-
@@ -476 +482 @@
-            if ( ($$pic{ctype} !~ /(jpeg|jpg)/i) and not $generic_ctype) {
-                wrong_ctype( "JPEG", $$pic{ctype} );
+                $internal_score += $conf->{'focr_wrongctype_score'};
-            }
-
-            if ( $suffix and $suffix !~ /(jpeg|jpg|jfif)/i) {
-                wrong_extension( "JPEG", $suffix);
+                $internal_score += $conf->{'focr_wrongext_score'};
-            }
-
@@ -515 +523 @@
-            if ( ($$pic{ctype} !~ /png/i) and not $generic_ctype) {
-                wrong_ctype( "PNG", $$pic{ctype} );
+                $internal_score += $conf->{'focr_wrongctype_score'};
-            }
-            if ( $suffix and $suffix !~ /(png)/i) {
-                wrong_extension( "PNG", $suffix);
+                $internal_score += $conf->{'focr_wrongext_score'};
-            }
-            foreach my $a (qw/pngtopnm/) {
@@ -553 +563 @@
-            if ( ($$pic{ctype} !~ /bmp/i) and not $generic_ctype) {
-                wrong_ctype( "BMP", $$pic{ctype} );
+                $internal_score += $conf->{'focr_wrongctype_score'};
-            }
-            if ( $suffix and $suffix !~ /(bmp)/i) {
-                wrong_extension( "BMP", $suffix);
+                $internal_score += $conf->{'focr_wrongext_score'};
-            }
-            foreach my $a (qw/bmptopnm/) {
@@ -590 +602 @@
-            if ( ($$pic{ctype} !~ /tif/i) and not $generic_ctype) {
-                wrong_ctype( "TIFF", $$pic{ctype} );
+                $internal_score += $conf->{'focr_wrongctype_score'};
-            }
-            if ( $suffix and $suffix !~ /tif/i) {
-                wrong_extension( "TIFF", $suffix);
+                $internal_score += $conf->{'focr_wrongext_score'};
-            }
-
@@ -654 +668 @@
-            infolog("Image hashing disabled in configuration, skipping...");
-        }
+
+        # Note: $current_score is here the score that the message had at the beginning
+        # and $score is the autodisable_score defined in the config
+        # $internal_score describes the score that the message got by FuzzyOcr so far.
+        if ($internal_score + $current_score > $score) {
+            my $total = $internal_score + $current_score;
+            infolog("OCR canceled, message got already more than $score points ($total) by other FuzzyOcr tests.");
+            return 0;
+        }
+
-        my @ocr_results = ();
-        my $scansets = get_scansets();

trunk/devel/FuzzyOcr/Config.pm

@@ -549 +549 @@
-        next unless $k =~ m/^focr_/;
-        next if $k =~ m/^focr_bin_/;
+        next if $k =~ m/^focr_mysql_pass/;
-        debuglog(" $k => ".$conf->{$k});
-    }