Changeset 16392 for gsdl/trunk/perllib/plugins/ConvertBinaryFile.pm

Timestamp:

2008-07-14T14:57:38+12:00 (16 years ago)

Author:

kjdon

Message:

global block pass: read_block is no more, use can_process_this_file to see whether a file is for us or not. extra arg (block_hash) to read, read_into_doc_obj, metadata_read etc

File:

• gsdl/trunk/perllib/plugins/ConvertBinaryFile.pm (modified) (3 diffs)

gsdl/trunk/perllib/plugins/ConvertBinaryFile.pm

@@ -366 +366 @@
 sub read_into_doc_obj {
     my $self = shift (@_);
-    my ($pluginfo, $base_dir, $file, $metadata, $processor, $maxdocs, $total_count, $gli) = @_;
+    my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $processor, $maxdocs, $total_count, $gli) = @_;
 
     my $outhandle = $self->{'outhandle'};
 
-    my ($filename_full_path, $filename_no_path) = $self->get_full_filenames($base_dir, $file);
+    my ($filename_full_path, $filename_no_path) = &util::get_full_filenames($base_dir, $file);
 
     my $output_ext = $self->{'convert_to_ext'};
@@ -411 +411 @@
 
     # note: metadata is not carried on to the next level
+## **** I just replaced $metadata with {} in following
     my ($rv,$doc_obj) 
-    = $secondary_plugin->read_into_doc_obj ($pluginfo,"", $conv_filename, $metadata, $processor, $maxdocs, $total_count, $gli);
+    = $secondary_plugin->read_into_doc_obj ($pluginfo,"", $conv_filename, $block_hash, {}, $processor, $maxdocs, $total_count, $gli);
 
     if ((!defined $rv) || ($rv<1)) {
@@ -438 +439 @@
     my $topsection = $doc_obj->get_top_section();
     $self->add_associated_files($doc_obj, $filename_full_path);
+
+    # extra_metadata is already called by sec plugin in process??
     $self->extra_metadata($doc_obj, $topsection, $metadata); # do we need this here??
     # do any automatic metadata extraction