Changeset 131

Show
Ignore:
Timestamp:
22.06.2007 18:32:06 (1 year ago)
Author:
decoder
Message:

Fixed formatting problems in rules description output using test_log API

!!This commit possibly breaks compatiblity to SA < 3.1.8!!

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/devel/FuzzyOcr.pm

    r130 r131  
    929929            $pms->{conf}->{scoreset}->[$set]->{"FUZZY_OCR"} = $score; 
    930930        } 
     931 
     932        #$pms->test_log("Words found:"); 
     933         
     934        #foreach (@found) { 
     935#               $pms->test_log($_); 
     936#       } 
     937 
     938#       $pms->test_log("($cnt word occurrences found)"); 
     939        my @dinfo = split('\n', $debuginfo); 
     940        foreach (@dinfo) { 
     941            $pms->test_log($_); 
     942        } 
     943 
    931944        $pms->_handle_hit( "FUZZY_OCR", $score, "BODY: ", "BODY",  
    932             $pms->{conf}->get_description_for_rule("FUZZY_OCR") . "\n$debuginfo" ); 
     945            $pms->{conf}->get_description_for_rule("FUZZY_OCR")); 
    933946    } 
    934947    if ($imgerr == 0 and $conf->{focr_keep_bad_images}<2) { 

  • trunk/devel/FuzzyOcr/Scoring.pm

    r130 r131  
    2626            $pms->{conf}->{scoreset}->[$set]->{"FUZZY_OCR_WRONG_CTYPE"} = $ws; 
    2727        } 
     28        my @dinfo = split('\n', $debuginfo); 
     29        foreach (@dinfo) { 
     30            $pms->test_log($_); 
     31        } 
    2832        $pms->_handle_hit( "FUZZY_OCR_WRONG_CTYPE", 
    2933            $conf->{'focr_wrongctype_score'}, "BODY: ", "BODY", 
    30             $pms->{conf}->get_description_for_rule("FUZZY_OCR_WRONG_CTYPE") . "\n$debuginfo" ); 
     34            $pms->{conf}->get_description_for_rule("FUZZY_OCR_WRONG_CTYPE")); 
    3135    } 
    3236} 
    …… 
    4751            $pms->{conf}->{scoreset}->[$set]->{"FUZZY_OCR_WRONG_EXTENSION"} = $ws; 
    4852        } 
     53        my @dinfo = split('\n', $debuginfo); 
     54        foreach (@dinfo) { 
     55            $pms->test_log($_); 
     56        } 
    4957        $pms->_handle_hit( "FUZZY_OCR_WRONG_EXTENSION", 
    5058            $conf->{'focr_wrongext_score'}, "BODY: ", "BODY", 
    51             $pms->{conf}->get_description_for_rule("FUZZY_OCR_WRONG_EXTENSION") . "\n$debuginfo" ); 
     59            $pms->{conf}->get_description_for_rule("FUZZY_OCR_WRONG_EXTENSION")); 
    5260    } 
    5361} 
    …… 
    6876            $pms->{conf}->{scoreset}->[$set]->{"FUZZY_OCR_CORRUPT_IMG"} = $ws; 
    6977        } 
     78        my @dinfo = split('\n', $debuginfo); 
     79        foreach (@dinfo) { 
     80                $pms->test_log($_); 
     81        } 
    7082        $pms->_handle_hit( "FUZZY_OCR_CORRUPT_IMG", $score, "BODY: ", "BODY", 
    71             $pms->{conf}->get_description_for_rule("FUZZY_OCR_CORRUPT_IMG") . "\n$debuginfo" ); 
     83            $pms->{conf}->get_description_for_rule("FUZZY_OCR_CORRUPT_IMG")); 
    7284    } 
    7385} 
    …… 
    7789    my $pms = get_pms(); 
    7890    my $score = $_[0] || $conf->{'focr_base_score'}; 
    79     my $dinfo = $_[1] ? "\n$_[1]" : ''; 
     91    my $debuginfo = $_[1] ? "\n$_[1]" : ''; 
    8092    my $ws = sprintf( "%0.3f", $score ); 
    8193    for my $set ( 0 .. 3 ) { 
    8294        $pms->{conf}->{scoreset}->[$set]->{"FUZZY_OCR_KNOWN_HASH"} = $ws; 
    8395    } 
     96    my @dinfo = split('\n', $debuginfo); 
     97    foreach (@dinfo) { 
     98        $pms->test_log($_); 
     99    } 
    84100    $pms->_handle_hit( "FUZZY_OCR_KNOWN_HASH", $score, "BODY: ", "BODY", 
    85         $pms->{conf}->get_description_for_rule("FUZZY_OCR_KNOWN_HASH") . $dinfo ); 
     101        $pms->{conf}->get_description_for_rule("FUZZY_OCR_KNOWN_HASH")); 
    86102} 
    87103