Changeset 16384

Show
Ignore:
Timestamp:
14.07.2008 14:40:51 (11 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)

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/perllib/plugins/PagedImagePlugin.pm

    r16009 r16384  
    239239sub read_into_doc_obj { 
    240240    my $self = shift (@_); 
    241     my ($pluginfo, $base_dir, $file, $metadata, $processor, $maxdocs, $total_count, $gli) = @_; 
     241    my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $processor, $maxdocs, $total_count, $gli) = @_; 
    242242    my $outhandle = $self->{'outhandle'}; 
    243243     
    244     my ($filename_full_path, $filename_no_path) = $self->get_full_filenames($base_dir, $file); 
     244    my ($filename_full_path, $filename_no_path) = &util::get_full_filenames($base_dir, $file); 
    245245 
    246246    print $outhandle "PagedImagePlugin processing \"$filename_full_path\"\n" 
     
    258258    if ($xml_version) { 
    259259    # careful checking needed here!! are we using local xml handlers or super ones 
    260     $self->ReadXMLFile::read($pluginfo, $base_dir, $file, $metadata, $processor, $maxdocs, $total_count, $gli); 
     260    $self->ReadXMLFile::read($pluginfo, $base_dir, $file, $block_hash, $metadata, $processor, $maxdocs, $total_count, $gli); 
    261261    $doc_obj = $self->{'doc_obj'}; 
    262262    } else { 
     
    365365    my $result = 0; 
    366366    if ($self->{'image_conversion_available'} == 1) { 
     367    # do we need to convert $filename_no_path to utf8? We are already reading in from a file, what encoding is it in??? 
    367368    $result = $self->generate_images($filename_full_path, $filename_no_path, $doc_obj, $section); 
    368369    }