Changeset 21315

Timestamp:

2009-12-09T15:33:35+13:00 (14 years ago)

Author:

kjdon

Message:

remove_one now returns a value

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• ArchivesInfPlugin.pm (modified) (1 diff)
• BasePlugin.pm (modified) (1 diff)
• DirectoryPlugin.pm (modified) (1 diff)

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

@@ -155 +155 @@
 sub remove_one {
     my $self = shift (@_);
-    my ($file, $oids) = @_;
-   
+    my ($file, $oids, $archivedir) = @_;
+    return undef; # only called during import at this stage, this will never be processing a file
+    
 }
 

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

@@ -329 +329 @@
     my $self = shift (@_);
     
-    my ($file, $oids) = @_;
+    my ($file, $oids, $archivedir) = @_;
+    return 0 if $self->can_process_this_file($file);
+    return undef;
 }
 

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

@@ -147 +147 @@
 }
 
+
 sub remove_one {
     my $self = shift (@_);
-    my ($file, $oids) = @_;
-    
+    my ($file, $oids, $archivedir) = @_;
+    return undef; # this will never be called for directories (will it??)
+
 }