Changeset 21287

Timestamp:

2009-12-07T14:38:09+13:00 (14 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

File:

• main/trunk/greenstone2/perllib/plugins/ImagePlugin.pm (modified) (6 diffs)

main/trunk/greenstone2/perllib/plugins/ImagePlugin.pm

@@ -28 +28 @@
 use BasePlugin;
 use ImageConverter;
-use PharosImageIndexer;
 
 use strict;
@@ -37 +36 @@
 
 sub BEGIN {
-    @ImagePlugin::ISA = ('BasePlugin', 'ImageConverter', 'PharosImageIndexer');
+    @ImagePlugin::ISA = ('BasePlugin', 'ImageConverter');
 }
 
@@ -66 +65 @@
     
     new ImageConverter($pluginlist, $inputargs, $hashArgOptLists);
-    new PharosImageIndexer($pluginlist, $inputargs, $hashArgOptLists);
     my $self = new BasePlugin($pluginlist, $inputargs, $hashArgOptLists);
 
@@ -78 +76 @@
     $self->SUPER::init(@_);
     $self->ImageConverter::init();
-    $self->PharosImageIndexer::init();
     $self->{'cover_image'} = 0; # makes no sense for images
 }
@@ -88 +85 @@
     $self->SUPER::begin(@_);
     $self->ImageConverter::begin(@_);
-    $self->PharosImageIndexer::begin(@_);
 }
+
 
 sub get_default_process_exp {
@@ -149 +146 @@
 }
 
-sub post_process_doc_obj {
-    my $self = shift (@_);
-    # options??
-    my ($pluginfo, $base_dir, $file, $metadata, $doc_obj, $gli) = @_;
-    if ($self->{'enable_pharos_imageis'}) {
-    $self->pharos_index_image(&util::filename_cat($base_dir, $file), $doc_obj);
-    }
-}
 
 sub clean_up_after_doc_obj_processing {