Changeset 21287

Show
Ignore:
Timestamp:
07.12.2009 14:38:09 (10 years ago)
Author:
kjdon
Message:

got rid of Pharos stuff out of here. PharosImagePlugin? now inherits from ImagePLugin, and lives in the extension folder to avoid cluttering up the main code

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/plugins/ImagePlugin.pm

    r21240 r21287  
    2828use BasePlugin; 
    2929use ImageConverter; 
    30 use PharosImageIndexer; 
    3130 
    3231use strict; 
     
    3736 
    3837sub BEGIN { 
    39     @ImagePlugin::ISA = ('BasePlugin', 'ImageConverter', 'PharosImageIndexer'); 
     38    @ImagePlugin::ISA = ('BasePlugin', 'ImageConverter'); 
    4039} 
    4140 
     
    6665     
    6766    new ImageConverter($pluginlist, $inputargs, $hashArgOptLists); 
    68     new PharosImageIndexer($pluginlist, $inputargs, $hashArgOptLists); 
    6967    my $self = new BasePlugin($pluginlist, $inputargs, $hashArgOptLists); 
    7068 
     
    7876    $self->SUPER::init(@_); 
    7977    $self->ImageConverter::init(); 
    80     $self->PharosImageIndexer::init(); 
    8178    $self->{'cover_image'} = 0; # makes no sense for images 
    8279} 
     
    8885    $self->SUPER::begin(@_); 
    8986    $self->ImageConverter::begin(@_); 
    90     $self->PharosImageIndexer::begin(@_); 
    9187} 
     88 
    9289 
    9390sub get_default_process_exp { 
     
    149146} 
    150147 
    151 sub post_process_doc_obj { 
    152     my $self = shift (@_); 
    153     # options?? 
    154     my ($pluginfo, $base_dir, $file, $metadata, $doc_obj, $gli) = @_; 
    155     if ($self->{'enable_pharos_imageis'}) { 
    156     $self->pharos_index_image(&util::filename_cat($base_dir, $file), $doc_obj); 
    157     } 
    158 } 
    159148 
    160149sub clean_up_after_doc_obj_processing {