Changeset 23212 for main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm

Timestamp:

2010-10-26T15:33:45+13:00 (14 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

File:

• main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm (modified) (5 diffs)

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!)