Changeset 21316 for gs3-extensions/pharos-imageis/trunk

Timestamp:

2009-12-09T15:39:40+13:00 (14 years ago)

Author:

kjdon

Message:

mods to remove_one

Location:

gs3-extensions/pharos-imageis/trunk/perllib/plugins

Files:

• PharosImageIndexer.pm (modified) (2 diffs)
• PharosImagePlugin.pm (modified) (1 diff)

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

@@ -96 +96 @@
     my $self = shift (@_);
     
-    my ($file, $oids) = @_;
+    my ($file, $oids, $archivedir) = @_;
     print STDERR "in pharos remove_one, $file, $oids\n";
     return if ($self->{'disable_pharos_imageis'});
@@ -105 +105 @@
     }
 
-    my $doc_id = @$oids[0];
+    my $doc_id = @$oids[0]; # do we need to do all the ids??
     return unless defined $doc_id;
     my $collection = &util::get_current_collection_name();

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

@@ -84 +84 @@
 sub remove_one {
     my $self = shift (@_);
-    my ($file, $oids) = @_;
-    $self->SUPER::remove_one(@_);
+    my ($file, $oids, $archivedir) = @_;
+    return undef if (!$self->can_process_this_file($file));
+    
     $self->PharosImageIndexer::remove_one(@_);
+    return $self->SUPER::remove_one(@_);
+    
+    
 }