Changeset 23212 for main/trunk/greenstone2

Timestamp:

2010-10-26T15:33:45+13:00 (13 years ago)

Author:

kjdon

Message:

metadata_read no longer takes maxdocs args - metadata_read must process all docs, so that whatever few are actually processed by read will get their metadata

Location:

main/trunk/greenstone2/perllib

Files:

• plugin.pm (modified) (2 diffs)
• plugins/ArchivesInfPlugin.pm (modified) (1 diff)
• plugins/BasePlugin.pm (modified) (1 diff)
• plugins/DSpacePlugin.pm (modified) (1 diff)
• plugins/DirectoryPlugin.pm (modified) (5 diffs)
• plugins/EmbeddedMetadataPlugin.pm (modified) (1 diff)
• plugins/GreenstoneXMLPlugin.pm (modified) (1 diff)
• plugins/LOMPlugin.pm (modified) (1 diff)
• plugins/MetadataCSVPlugin.pm (modified) (1 diff)
• plugins/MetadataXMLPlugin.pm (modified) (1 diff)
• plugins/OAIMetadataXMLPlugin.pm (modified) (1 diff)
• plugins/OAIPlugin.pm (modified) (1 diff)
• plugins/SplitTextFile.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/plugin.pm

@@ -280 +280 @@
     my ($pluginfo, $base_dir, $file, $block_hash, 
     $extrametakeys, $extrametadata, $extrametafile, 
-    $processor, $maxdocs, $gli, $aux) = @_;
-
-    $maxdocs = -1 unless defined $maxdocs && $maxdocs =~ /\d/;
+    $processor, $gli, $aux) = @_;
+
     $gli = 0 unless defined $gli;
 
@@ -313 +312 @@
     $rv = $plugobj->metadata_read($pluginfo, $base_dir, $file, $block_hash,
                  $extrametakeys, $extrametadata, $extrametafile,
-                 $processor, $maxdocs, $gli, $aux);
+                 $processor, $gli, $aux);
 
     if (defined $rv) {

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

@@ -189 +189 @@
     my ($pluginfo, $base_dir, $file, $block_hash, 
     $extrametakeys, $extrametadata, $extrametafile,
-    $processor, $maxdocs, $gli) = @_;
+    $processor, $gli, $aux) = @_;
 
     return undef;

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

@@ -939 +939 @@
     my ($pluginfo, $base_dir, $file, $block_hash, 
     $extrametakeys, $extrametadata, $extrametafile,
-    $processor, $maxdocs, $gli) = @_;
+    $processor, $gli, $aux) = @_;
     
     # can we process this file??

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

@@ -256 +256 @@
     my ($pluginfo, $base_dir, $file, $block_hash, 
     $extrametakeys, $extrametadata, $extrametafile,
-    $processor, $maxdocs, $gli) = @_;
+    $processor, $gli, $aux) = @_;
 
     my $only_first_doc = $self->{'only_first_doc'};

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

@@ -336 +336 @@
     my ($pluginfo, $base_dir, $file, $block_hash, 
     $extrametakeys, $extrametadata, $extrametafile,
-    $processor, $maxdocs, $gli) = @_;
+    $processor, $gli, $aux) = @_;
 
     return undef;
@@ -379 +379 @@
     # Recur over directory contents.
     my (@dir, $subfile);
-    my $count = 0;
     
     print $outhandle "DirectoryPlugin read: getting directory $dirname\n" if ($verbosity > 2);
@@ -433 +432 @@
     }
     }
-    # apply metadata pass for each of the files in the directory
+    # apply metadata pass for each of the files in the directory -- ignore
+    # maxdocs here
     my $num_files = scalar(@dir);
     for (my $i = 0; $i < scalar(@dir); $i++) {
     my $subfile = $dir[$i];
     my $this_file_base_dir = $base_dir;
-    last if ($maxdocs != -1 && $count >= $maxdocs);
     next if ($subfile =~ m/^\.\.?$/);
     my $file_subfile = &util::filename_cat($file, $subfile);
@@ -450 +449 @@
     print $outhandle "DirectoryPlugin metadata recurring: $subfile\n" if ($verbosity > 2);
     
-    $count += &plugin::metadata_read ($pluginfo, $this_file_base_dir,
-                      $file_subfile,$block_hash,
-                      \@extrametakeys, \%extrametadata,
-                      \%extrametafile,
-                      $processor, $maxdocs, $gli);
+    &plugin::metadata_read ($pluginfo, $this_file_base_dir,
+                $file_subfile,$block_hash,
+                \@extrametakeys, \%extrametadata,
+                \%extrametafile,
+                $processor, $gli);
     $additionalmetadata = 1;
     }
@@ -485 +484 @@
     
     # import each of the files in the directory
-    $count=0;
+    my $count=0;
     for (my $i = 0; $i <= scalar(@dir); $i++) {
     # When every file in the directory has been done, pause for a moment (figuratively!)

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

@@ -203 +203 @@
   my ($pluginfo, $base_dir, $file, $block_hash, 
       $extrametakeys, $extrametadata, $extrametafile,
-      $processor, $maxdocs, $gli) = @_;
+      $processor, $gli, $aux) = @_;
   
   my ($filename_full_path, $filename_no_path) = &util::get_full_filenames($base_dir, $file);

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

@@ -97 +97 @@
     my ($pluginfo, $base_dir, $file, $block_hash, 
     $extrametakeys, $extrametadata, $extrametafile,
-    $processor, $maxdocs, $gli) = @_;
+    $processor, $gli, $aux) = @_;
 
     my $outhandle = $self->{'outhandle'};

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

@@ -123 +123 @@
     my ($pluginfo, $base_dir, $file, $block_hash, 
     $extrametakeys, $extrametadata, $extrametafile,
-    $processor, $maxdocs, $gli) = @_;
+    $processor, $gli, $aux) = @_;
 
     my $outhandle = $self->{'outhandle'};

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

@@ -99 +99 @@
     my ($pluginfo, $base_dir, $file, $block_hash, 
     $extrametakeys, $extrametadata, $extrametafile,
-    $processor, $maxdocs, $gli) = @_;
+    $processor, $gli, $aux) = @_;
 
     # Read metadata from CSV files

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

@@ -228 +228 @@
     my ($pluginfo, $base_dir, $file, $block_hash, 
     $extrametakeys, $extrametadata,$extrametafile,
-    $processor, $maxdocs, $gli) = @_;
+    $processor, $gli, $aux) = @_;
 
     my $filename = &util::filename_cat($base_dir, $file);

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

@@ -84 +84 @@
 {
   my $self = shift (@_);
-  my ($pluginfo, $base_dir, $file, $block_hash, $extrametakeys, $extrametadata,$extrametafile, $processor, $maxdocs, $gli) = @_;
+  my ($pluginfo, $base_dir, $file, $block_hash, $extrametakeys, $extrametadata,$extrametafile, $processor, $gli, $aux) = @_;
   
   # Read in the normal metadata.xml file

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

@@ -191 +191 @@
     my ($pluginfo, $base_dir, $file, $block_hash, 
     $extrametakeys, $extrametadata, $extrametafile,
-    $processor, $maxdocs, $gli) = @_;
+    $processor, $gli, $aux) = @_;
 
     # can we process this file??

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

@@ -120 +120 @@
     my ($pluginfo, $base_dir, $file, $block_hash, 
     $extrametakeys, $extrametadata, $extrametafile,
-    $processor, $maxdocs, $gli) = @_;
-
-    # returns 1 if matches process_exp, and has done blocking in the meantime
+    $processor, $gli, $aux) = @_;
+
+    # returns 1 if matches process_exp
     my $matched = $self->SUPER::metadata_read($pluginfo, $base_dir, $file,
                           $block_hash, 
@@ -128 +128 @@
                           $extrametadata, 
                           $extrametafile,
-                          $processor, $maxdocs, $gli);
+                          $processor, $gli, $aux);
     my $split_matched = undef;