Changeset 63

Show
Ignore:
Timestamp:
27.11.2006 22:40:25 (2 years ago)
Author:
decoder
Message:

Logging.pm: Added correct "use" lines for locking constants
Config.pm/FuzzyOcr.cf: synced default values, Default value listed in FuzzyOcr?.cf was not the default value (I corrected the values in Config.pm).
If any of the default values should be changed, we need to make sure we change them in both files :)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/devel/FuzzyOcr.cf

    r60 r63  
    2020#focr_log_stderr 1 
    2121# 
    22 # Logfile (make sure it is writable by the plugin) (Default value: /etc/mail/spamassassin/FuzzyOcr.log
     22# Logfile (make sure it is writable by the plugin) (Default value: undefined (means no logfile if you don't set one!
    2323#focr_logfile /etc/mail/spamassassin/FuzzyOcr.log 
    2424########################## 
     
    6363#focr_preprocessor_file /etc/mail/spamassassin/FuzzyOcr.preps 
    6464#focr_scanset_file /etc/mail/spamassassin/FuzzyOcr.scansets 
     65# 
     66## Setting this to 1 will cause FuzzyOcr to skip all other scansets, if a scanset has 
     67## reached the amount of hits specified in focr_counts_required. (i.e. if the image is detected as spam). 
     68## This saves resources, but lowers the scores because not the best, but the first best scanset is taken as result. 
     69#focr_minimal_scanset 0.0 
    6570# 
    6671######### 
  • trunk/devel/FuzzyOcr/Config.pm

    r61 r63  
    303303    push (@cmds, { 
    304304        setting => 'focr_base_score', 
    305         default => 3
     305        default => 5
    306306        type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC 
    307307       }); 
     
    309309    push (@cmds, { 
    310310        setting => 'focr_add_score', 
    311         default => 0.5
     311        default => 1
    312312        type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC 
    313313       }); 
     
    378378        type => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING 
    379379        }); 
    380  
     380    push (@cmds, { 
     381            setting => 'focr_minimal_scanset', 
     382            default => 0, 
     383            type => $Mail::SpamAssassin::Conf::CONF_TYPE_BOOL 
     384        }); 
    381385    push (@cmds, { 
    382386        setting => 'focr_mysql_host', 
  • trunk/devel/FuzzyOcr/Logging.pm

    r61 r63  
    66use FuzzyOcr::Config; 
    77use Mail::SpamAssassin::Logger; 
     8 
     9use FileHandle; 
     10use Fcntl ':flock'; 
    811 
    912sub logfile {