Changeset 21342

Timestamp:

2009-12-14T14:46:56+13:00 (14 years ago)

Author:

kjdon

Message:

moved disable_pharos_imageis option into PharosImagePlugin

File:

• gs3-extensions/pharos-imageis/trunk/perllib/plugins/PharosImageIndexer.pm (modified) (5 diffs)

gs3-extensions/pharos-imageis/trunk/perllib/plugins/PharosImageIndexer.pm

@@ -39 +39 @@
 
 my $arguments = [
-         { 'name' => "disable_pharos_imageis",
-           'desc' => "{PharosImageIndexer.disable_pharos_imageis}",
-           'type' => "flag",
-           'reqd' => "no" },
          ];
 
@@ -70 +66 @@
     my $self = shift(@_);
     
-    return if ($self->{'disable_pharos_imageis'});
-
     # Check that Pharos is installed and available on the path 
     my $pharos_available = 1;
@@ -98 +92 @@
     my ($file, $oids, $archivedir) = @_;
     print STDERR "in pharos remove_one, $file, $oids\n";
-    return if ($self->{'disable_pharos_imageis'});
 
     if (!$self->{'pharos_available'}) {
@@ -123 +116 @@
     my ($pluginfo, $base_dir, $processor, $maxdocs) = @_;
     
-    return if ($self->{'disable_pharos_imageis'});
-
     if (!$self->{'pharos_available'}) {
     print STDERR "pharos not available, not doing a remove_all\n";
@@ -146 +137 @@
     my $self = shift(@_);
 
-    return if ($self->{'disable_pharos_imageis'} || !$self->{'pharos_available'});
+    if ( !$self->{'pharos_available'}) {
+    print STDERR "pharos not available, can't index the image\n";
+    return;
+    }
     # pass in the jpg thumbnail, and the doc obj
     my ($filename_full_path, $doc_obj) = @_;