Changeset 21342

Show
Ignore:
Timestamp:
14.12.2009 14:46:56 (10 years ago)
Author:
kjdon
Message:

moved disable_pharos_imageis option into PharosImagePlugin?

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gs3-extensions/pharos-imageis/trunk/perllib/plugins/PharosImageIndexer.pm

    r21316 r21342  
    3939 
    4040my $arguments = [ 
    41          { 'name' => "disable_pharos_imageis", 
    42            'desc' => "{PharosImageIndexer.disable_pharos_imageis}", 
    43            'type' => "flag", 
    44            'reqd' => "no" }, 
    4541         ]; 
    4642 
     
    7066    my $self = shift(@_); 
    7167     
    72     return if ($self->{'disable_pharos_imageis'}); 
    73  
    7468    # Check that Pharos is installed and available on the path  
    7569    my $pharos_available = 1; 
     
    9892    my ($file, $oids, $archivedir) = @_; 
    9993    print STDERR "in pharos remove_one, $file, $oids\n"; 
    100     return if ($self->{'disable_pharos_imageis'}); 
    10194 
    10295    if (!$self->{'pharos_available'}) { 
     
    123116    my ($pluginfo, $base_dir, $processor, $maxdocs) = @_; 
    124117     
    125     return if ($self->{'disable_pharos_imageis'}); 
    126  
    127118    if (!$self->{'pharos_available'}) { 
    128119    print STDERR "pharos not available, not doing a remove_all\n"; 
     
    146137    my $self = shift(@_); 
    147138 
    148     return if ($self->{'disable_pharos_imageis'} || !$self->{'pharos_available'}); 
     139    if ( !$self->{'pharos_available'}) { 
     140    print STDERR "pharos not available, can't index the image\n"; 
     141    return; 
     142    } 
    149143    # pass in the jpg thumbnail, and the doc obj 
    150144    my ($filename_full_path, $doc_obj) = @_;