Changeset 16384

Timestamp:

2008-07-14T14:40:51+12:00 (15 years ago)

Author:

kjdon

Message:

global block pass: new block_hash arg to read and metadata_read. Also added a comment about whether we need to convert the filename to utf8 before calling generate_images (I am not sure)

File:

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

gsdl/trunk/perllib/plugins/PagedImagePlugin.pm

@@ -239 +239 @@
 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);
 
     print $outhandle "PagedImagePlugin processing \"$filename_full_path\"\n"
@@ -258 +258 @@
     if ($xml_version) {
     # careful checking needed here!! are we using local xml handlers or super ones
-    $self->ReadXMLFile::read($pluginfo, $base_dir, $file, $metadata, $processor, $maxdocs, $total_count, $gli);
+    $self->ReadXMLFile::read($pluginfo, $base_dir, $file, $block_hash, $metadata, $processor, $maxdocs, $total_count, $gli);
     $doc_obj = $self->{'doc_obj'};
     } else {
@@ -365 +365 @@
     my $result = 0;
     if ($self->{'image_conversion_available'} == 1) {
+    # do we need to convert $filename_no_path to utf8? We are already reading in from a file, what encoding is it in???
     $result = $self->generate_images($filename_full_path, $filename_no_path, $doc_obj, $section);
     }