Changeset 16392 for gsdl/trunk/perllib/plugins/CONTENTdmPlugin.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/CONTENTdmPlugin.pm (modified) (6 diffs)

gsdl/trunk/perllib/plugins/CONTENTdmPlugin.pm

@@ -557 +557 @@
 
 # Override ConvertBinaryFile read
-# Needed so multiple .item files generate are sent down secondary plugin
+# Needed so multiple .item files generated are sent down secondary plugin
 
 sub read {
     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) = @_;
 
     $self->{'gli'} = $gli;
@@ -570 +570 @@
     my $outhandle = $self->{'outhandle'};
     
-    my ($block_status,$filename) = $self->read_block(@_);
-    return $block_status if ((!defined $block_status) || ($block_status==0));
+    my ($filename_full_path, $filename_no_path) = &util::get_full_filenames($base_dir, $file);
+    return undef unless $self->can_process_this_file($filename_full_path);
+
     $file =~ s/^[\/\\]+//; # $file often begins with / so we'll tidy it up
        
@@ -580 +581 @@
     my $conv_filename_list = [];
 
-    $conv_filename_list = $self->tmp_area_convert_file($output_ext, $filename);
+    $conv_filename_list = $self->tmp_area_convert_file($output_ext, $filename_full_path);
     
     if (scalar(@$conv_filename_list)==0) {
@@ -611 +612 @@
     my ($rv,$doc_obj) 
         = $secondary_plugin->read_into_doc_obj ($pluginfo,"", $conv_filename, 
-                            $metadata, $processor, $maxdocs, $total_count,
+                            $block_hash, $metadata, $processor, $maxdocs, $total_count,
                             $gli);
 
@@ -619 +620 @@
 
     # Override previous gsdlsourcefilename set by secondary plugin
-    my $collect_file = &util::filename_within_collection($filename);
+    my $collect_file = &util::filename_within_collection($filename_full_path);
     my $collect_conv_file = &util::filename_within_collection($conv_filename);
     $doc_obj->set_source_filename ($collect_file); 
@@ -627 +628 @@
     $self->set_Source_metadata($doc_obj, $filemeta);
     $doc_obj->set_utf8_metadata_element($doc_obj->get_top_section(), "Plugin", "$self->{'plugin_type'}");
-    $doc_obj->set_utf8_metadata_element($doc_obj->get_top_section(), "FileSize", (-s $filename));
+    $doc_obj->set_utf8_metadata_element($doc_obj->get_top_section(), "FileSize", (-s $filename_full_path));
     
     if ($self->{'cover_image'}) {
-        $self->associate_cover_image($doc_obj, $filename);
+        $self->associate_cover_image($doc_obj, $filename_full_path);
     }