Ignore:
Timestamp:
2011-01-14T09:53:23+13:00 (13 years ago)
Author:
sjm84
Message:

Merging the latest trunk changes into this branch

Location:
main/branches/64_bit_Greenstone/greenstone2
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • main/branches/64_bit_Greenstone/greenstone2

  • main/branches/64_bit_Greenstone/greenstone2/perllib/plugins/PagedImagePlugin.pm

    r23452 r23580  
    576576
    577577    if ($line =~ /imgfile=\"([^\"]+)\"/) {
    578         $self->block_filename($block_hash,$dir.$1);
     578        &util::block_filename($block_hash,$dir.$1);
    579579    }
    580580    if ($line =~ /txtfile=\"([^\"]+)\"/) {
    581         $self->block_filename($block_hash,$dir.$1);
     581        &util::block_filename($block_hash,$dir.$1);
    582582    }
    583583    }
    … …  
    605605    # find the image file if there is one
    606606    if (defined $imgname && $imgname ne "") {
    607         $self->block_filename($block_hash, &util::filename_cat( $dir,$imgname));
     607        &util::block_filename($block_hash, &util::filename_cat( $dir,$imgname));
    608608    }
    609609    # find the text file if there is one
    610610    if (defined $txtname && $txtname ne "") {
    611         $self->block_filename($block_hash, &util::filename_cat($dir,$txtname));
     611        &util::block_filename($block_hash, &util::filename_cat($dir,$txtname));
    612612    }
    613613    }
Note: See TracChangeset for help on using the changeset viewer.