Changeset 23212
- Timestamp:
- 2010-10-26T15:33:45+13:00 (14 years ago)
- Location:
- main/trunk/greenstone2/perllib
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/plugin.pm
r23170 r23212 280 280 my ($pluginfo, $base_dir, $file, $block_hash, 281 281 $extrametakeys, $extrametadata, $extrametafile, 282 $processor, $maxdocs, $gli, $aux) = @_; 283 284 $maxdocs = -1 unless defined $maxdocs && $maxdocs =~ /\d/; 282 $processor, $gli, $aux) = @_; 283 285 284 $gli = 0 unless defined $gli; 286 285 … … 313 312 $rv = $plugobj->metadata_read($pluginfo, $base_dir, $file, $block_hash, 314 313 $extrametakeys, $extrametadata, $extrametafile, 315 $processor, $ maxdocs, $gli, $aux);314 $processor, $gli, $aux); 316 315 317 316 if (defined $rv) { -
main/trunk/greenstone2/perllib/plugins/ArchivesInfPlugin.pm
r23171 r23212 189 189 my ($pluginfo, $base_dir, $file, $block_hash, 190 190 $extrametakeys, $extrametadata, $extrametafile, 191 $processor, $ maxdocs, $gli) = @_;191 $processor, $gli, $aux) = @_; 192 192 193 193 return undef; -
main/trunk/greenstone2/perllib/plugins/BasePlugin.pm
r22953 r23212 939 939 my ($pluginfo, $base_dir, $file, $block_hash, 940 940 $extrametakeys, $extrametadata, $extrametafile, 941 $processor, $ maxdocs, $gli) = @_;941 $processor, $gli, $aux) = @_; 942 942 943 943 # can we process this file?? -
main/trunk/greenstone2/perllib/plugins/DSpacePlugin.pm
r21367 r23212 256 256 my ($pluginfo, $base_dir, $file, $block_hash, 257 257 $extrametakeys, $extrametadata, $extrametafile, 258 $processor, $ maxdocs, $gli) = @_;258 $processor, $gli, $aux) = @_; 259 259 260 260 my $only_first_doc = $self->{'only_first_doc'}; -
main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm
r23171 r23212 336 336 my ($pluginfo, $base_dir, $file, $block_hash, 337 337 $extrametakeys, $extrametadata, $extrametafile, 338 $processor, $ maxdocs, $gli) = @_;338 $processor, $gli, $aux) = @_; 339 339 340 340 return undef; … … 379 379 # Recur over directory contents. 380 380 my (@dir, $subfile); 381 my $count = 0;382 381 383 382 print $outhandle "DirectoryPlugin read: getting directory $dirname\n" if ($verbosity > 2); … … 433 432 } 434 433 } 435 # apply metadata pass for each of the files in the directory 434 # apply metadata pass for each of the files in the directory -- ignore 435 # maxdocs here 436 436 my $num_files = scalar(@dir); 437 437 for (my $i = 0; $i < scalar(@dir); $i++) { 438 438 my $subfile = $dir[$i]; 439 439 my $this_file_base_dir = $base_dir; 440 last if ($maxdocs != -1 && $count >= $maxdocs);441 440 next if ($subfile =~ m/^\.\.?$/); 442 441 my $file_subfile = &util::filename_cat($file, $subfile); … … 450 449 print $outhandle "DirectoryPlugin metadata recurring: $subfile\n" if ($verbosity > 2); 451 450 452 $count +=&plugin::metadata_read ($pluginfo, $this_file_base_dir,453 454 455 456 $processor, $maxdocs, $gli);451 &plugin::metadata_read ($pluginfo, $this_file_base_dir, 452 $file_subfile,$block_hash, 453 \@extrametakeys, \%extrametadata, 454 \%extrametafile, 455 $processor, $gli); 457 456 $additionalmetadata = 1; 458 457 } … … 485 484 486 485 # import each of the files in the directory 487 $count=0;486 my $count=0; 488 487 for (my $i = 0; $i <= scalar(@dir); $i++) { 489 488 # When every file in the directory has been done, pause for a moment (figuratively!) -
main/trunk/greenstone2/perllib/plugins/EmbeddedMetadataPlugin.pm
r22552 r23212 203 203 my ($pluginfo, $base_dir, $file, $block_hash, 204 204 $extrametakeys, $extrametadata, $extrametafile, 205 $processor, $ maxdocs, $gli) = @_;205 $processor, $gli, $aux) = @_; 206 206 207 207 my ($filename_full_path, $filename_no_path) = &util::get_full_filenames($base_dir, $file); -
main/trunk/greenstone2/perllib/plugins/GreenstoneXMLPlugin.pm
r23167 r23212 97 97 my ($pluginfo, $base_dir, $file, $block_hash, 98 98 $extrametakeys, $extrametadata, $extrametafile, 99 $processor, $ maxdocs, $gli) = @_;99 $processor, $gli, $aux) = @_; 100 100 101 101 my $outhandle = $self->{'outhandle'}; -
main/trunk/greenstone2/perllib/plugins/LOMPlugin.pm
r22900 r23212 123 123 my ($pluginfo, $base_dir, $file, $block_hash, 124 124 $extrametakeys, $extrametadata, $extrametafile, 125 $processor, $ maxdocs, $gli) = @_;125 $processor, $gli, $aux) = @_; 126 126 127 127 my $outhandle = $self->{'outhandle'}; -
main/trunk/greenstone2/perllib/plugins/MetadataCSVPlugin.pm
r22852 r23212 99 99 my ($pluginfo, $base_dir, $file, $block_hash, 100 100 $extrametakeys, $extrametadata, $extrametafile, 101 $processor, $ maxdocs, $gli) = @_;101 $processor, $gli, $aux) = @_; 102 102 103 103 # Read metadata from CSV files -
main/trunk/greenstone2/perllib/plugins/MetadataXMLPlugin.pm
r22857 r23212 228 228 my ($pluginfo, $base_dir, $file, $block_hash, 229 229 $extrametakeys, $extrametadata,$extrametafile, 230 $processor, $ maxdocs, $gli) = @_;230 $processor, $gli, $aux) = @_; 231 231 232 232 my $filename = &util::filename_cat($base_dir, $file); -
main/trunk/greenstone2/perllib/plugins/OAIMetadataXMLPlugin.pm
r22232 r23212 84 84 { 85 85 my $self = shift (@_); 86 my ($pluginfo, $base_dir, $file, $block_hash, $extrametakeys, $extrametadata,$extrametafile, $processor, $ maxdocs, $gli) = @_;86 my ($pluginfo, $base_dir, $file, $block_hash, $extrametakeys, $extrametadata,$extrametafile, $processor, $gli, $aux) = @_; 87 87 88 88 # Read in the normal metadata.xml file -
main/trunk/greenstone2/perllib/plugins/OAIPlugin.pm
r22316 r23212 191 191 my ($pluginfo, $base_dir, $file, $block_hash, 192 192 $extrametakeys, $extrametadata, $extrametafile, 193 $processor, $ maxdocs, $gli) = @_;193 $processor, $gli, $aux) = @_; 194 194 195 195 # can we process this file?? -
main/trunk/greenstone2/perllib/plugins/SplitTextFile.pm
r19617 r23212 120 120 my ($pluginfo, $base_dir, $file, $block_hash, 121 121 $extrametakeys, $extrametadata, $extrametafile, 122 $processor, $ maxdocs, $gli) = @_;123 124 # returns 1 if matches process_exp , and has done blocking in the meantime122 $processor, $gli, $aux) = @_; 123 124 # returns 1 if matches process_exp 125 125 my $matched = $self->SUPER::metadata_read($pluginfo, $base_dir, $file, 126 126 $block_hash, … … 128 128 $extrametadata, 129 129 $extrametafile, 130 $processor, $ maxdocs, $gli);130 $processor, $gli, $aux); 131 131 my $split_matched = undef; 132 132
Note:
See TracChangeset
for help on using the changeset viewer.