Changeset 17738 for gsdl

Timestamp:

2008-11-06T13:50:44+13:00 (15 years ago)

Author:

kjdon

Message:

AbstractPLugin has been removedd, so these now inherit from PrintInfo, and code from AbstractPlugin has been added to these two classes

Location:

gsdl/trunk/perllib/plugins

Files:

• ArchivesInfPlugin.pm (modified) (5 diffs)
• DirectoryPlugin.pm (modified) (8 diffs)

gsdl/trunk/perllib/plugins/ArchivesInfPlugin.pm

@@ -24 +24 @@
 ###########################################################################
 
-# plugin which recurses through an archives.inf file
+# plugin which reads through an archives.inf file
 # (i.e. the file generated in the archives directory
 # when an import is done), processing each file it finds 
 
-# 12-05-02 Added usage datastructure - John Thompson
-
 package ArchivesInfPlugin;
 
 use util;
-use AbstractPlugin;
+use PrintInfo;
 use plugin;
 use arcinfo;
@@ -42 +40 @@
 
 BEGIN {
-    @ArchivesInfPlugin::ISA = ('AbstractPlugin');
+    @ArchivesInfPlugin::ISA = ('PrintInfo');
 }
 
@@ -66 +64 @@
     push(@{$hashArgOptLists->{"OptList"}},$options);
 
-    my $self = new AbstractPlugin($pluginlist, $inputargs, $hashArgOptLists);
+    my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists);
 
     return bless $self, $class;
+}
+
+# called once, at the start of processing
+sub init {
+    my $self = shift (@_);
+    my ($verbosity, $outhandle, $failhandle) = @_;
+
+    # verbosity is passed through from the processor
+    $self->{'verbosity'} = $verbosity;
+
+    # as are the outhandle and failhandle
+    $self->{'outhandle'} = $outhandle if defined $outhandle;
+    $self->{'failhandle'} = $failhandle;
+
 }
 
@@ -94 +106 @@
 }
 
+# called at the beginning of each plugin pass (import has one, buildin has many)
+sub begin {
+    my $self = shift (@_);
+    my ($pluginfo, $base_dir, $processor, $maxdocs) = @_;
+
+}
+
+# called at the end of each plugin pass
+sub end {
+    my ($self) = shift (@_);
+
+}
+
+# called if we are doing incremental building
+sub set_incremental {
+    my $self = shift(@_);
+    my ($incremental) = @_;
+
+    $self->{'incremental'} = $incremental;
+}
+
 # return 1 if this class might recurse using $pluginfo
 sub is_recursive {
@@ -102 +135 @@
 
 
+sub compile_stats {
+    my $self = shift(@_);
+    my ($stats) = @_;
+}
+
+# We don't do metadata_read
+sub metadata_read {
+    my $self = shift (@_);
+    my ($pluginfo, $base_dir, $file, $block_hash, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli) = @_;
+
+    return undef;
+}
+
+# we don't do any file blocking
+sub file_block_read {
+
+    my $self = shift (@_);  
+    my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $gli) = @_;
+
+    return undef;
+}
 
 

gsdl/trunk/perllib/plugins/DirectoryPlugin.pm

@@ -30 +30 @@
 package DirectoryPlugin;
 
-use AbstractPlugin;
+use PrintInfo;
 use plugin;
 use util;
@@ -43 +43 @@
 
 BEGIN {
-    @DirectoryPlugin::ISA = ('AbstractPlugin');
+    @DirectoryPlugin::ISA = ('PrintInfo');
 }
 
@@ -77 +77 @@
     push(@{$hashArgOptLists->{"OptList"}},$options);
 
-    my $self = new AbstractPlugin($pluginlist, $inputargs, $hashArgOptLists);
+    my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists);
     
     if ($self->{'info_only'}) {
@@ -89 +89 @@
     }
     
+    $self->{'num_processed'} = 0;
+    $self->{'num_not_processed'} = 0;
+    $self->{'num_blocked'} = 0;
+    $self->{'num_archives'} = 0;
+
     $self->{'subdir_extrametakeys'} = {};
 
@@ -94 +99 @@
 }
 
+# called once, at the start of processing
+sub init {
+    my $self = shift (@_);
+    my ($verbosity, $outhandle, $failhandle) = @_;
+
+    # verbosity is passed through from the processor
+    $self->{'verbosity'} = $verbosity;
+
+    # as are the outhandle and failhandle
+    $self->{'outhandle'} = $outhandle if defined $outhandle;
+    $self->{'failhandle'} = $failhandle;
+
+}
+
+# called once, after all passes have finished
+sub deinit {
+    my ($self) = @_;
+
+}
+
+# called at the beginning of each plugin pass (import has one, building has many)
 sub begin {
     my $self = shift (@_);
@@ -111 +137 @@
     }
     }
-
-    #$self->SUPER::begin($pluginfo, $base_dir, $processor, $maxdocs);
-}
-
+}
+
+# called at the end of each plugin pass
 sub end {
-
-}
-
-sub deinit {
-
-}
+    my ($self) = shift (@_);
+
+}
+
+
+# called if we are doing incremental building
+sub set_incremental {
+    my $self = shift(@_);
+    my ($incremental) = @_;
+
+    $self->{'incremental'} = $incremental;
+}
+
 # return 1 if this class might recurse using $pluginfo
 sub is_recursive {
@@ -284 +316 @@
     
 }
+
+# We don't do metadata_read
+sub metadata_read {
+    my $self = shift (@_);
+    my ($pluginfo, $base_dir, $file, $block_hash, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli) = @_;
+
+    return undef;
+}
+
+
 # return number of files processed, undef if can't process
 # Note that $base_dir might be "" and that $file might 
@@ -551 +593 @@
 }
 
+sub compile_stats {
+    my $self = shift(@_);
+    my ($stats) = @_;
+}
+
 1;