Changeset 72

Timestamp:

30.11.2006 21:22:07 (2 years ago)

Author:

jorge

Message:

Fixed personal_wordlist processing, broke since ~ver 68

Files:

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

trunk/devel/FuzzyOcr.pm

@@ -122 +122 @@
-
-    debuglog("Starting FuzzyOcr...");
-    if ($conf->{focr_personal_wordlist} =~ m/^\//) {
-        debuglog("Attempting to load personal wordlist...");
-        read_words( $conf->{focr_personal_wordlist} );
-    }
-
-    foreach my $p (
-        $pms->{msg}->find_parts(qr(^image\b)i),
@@ -281 +276 @@
-    debuglog("Errors to: $imgdir/raw.err") if ($haserr>0);
-
+    # Try to load personal wordlist
+    if ($conf->{focr_personal_wordlist} =~ m/^\//) {
+        infolog("Attempting to load personal wordlist...");
+        read_words( $conf->{focr_personal_wordlist} );
+    } else {
+        my $peruserlist = $main->sed_path($conf->{focr_personal_wordlist});
+        if ( -r $peruserlist ) {
+            read_words( $peruserlist );
+        } else {
+            errorlog("Cannot read personal_wordlist: $peruserlist, skipping...");
+        }
+    }
+
-    IMAGE:
-    foreach my $file (keys %imgfiles) {

trunk/devel/FuzzyOcr/Config.pm

@@ -506 +506 @@
-    my $main = $self->{main};
-    $conf = $opts->{conf};
-
-
-    # fix paths
-    foreach (qw/focr_personal_wordlist focr_global_wordlist
-            focr_db_hash focr_db_safe focr_hash_db
-            focr_scanset_file focr_preprocessor_file/) {
-        next unless defined $conf->{$_};
-        my $path = $main->sed_path($conf->{$_});
-        $conf->{$_} = $path ? $path : $_;
-        debuglog("$_ => $path");
-    }
-
-    # find external binaries