Ignore:
Timestamp:
2017-03-09T14:35:57+13:00 (5 years ago)
Author:
kjdon
Message:

util::block_file moved to EncodingUtil::block_raw_filename

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/plugins/PagedImagePlugin.pm

    r31113 r31480  
    647647
    648648    if ($line =~ /imgfile=\"([^\"]+)\"/) {
    649         &util::block_filename($block_hash,&FileUtils::filenameConcatenate($dir,$1));
     649        $self->block_raw_filename($block_hash,&FileUtils::filenameConcatenate($dir,$1));
    650650    }
    651651    if ($line =~ /txtfile=\"([^\"]+)\"/) {
    652         &util::block_filename($block_hash,&FileUtils::filenameConcatenate($dir,$1));
     652        $self->block_raw_filename($block_hash,&FileUtils::filenameConcatenate($dir,$1));
    653653    }
    654654    }
     
    677677    # find the image file if there is one
    678678    if (defined $imgname && $imgname ne "") {
    679         &util::block_filename($block_hash, &FileUtils::filenameConcatenate( $dir,$imgname));
     679        $self->block_raw_filename($block_hash, &FileUtils::filenameConcatenate( $dir,$imgname));
    680680    }
    681681    # find the text file if there is one
    682682    if (defined $txtname && $txtname ne "") {
    683         &util::block_filename($block_hash, &FileUtils::filenameConcatenate($dir,$txtname));
     683        $self->block_raw_filename($block_hash, &FileUtils::filenameConcatenate($dir,$txtname));
    684684    }
    685685    }
Note: See TracChangeset for help on using the changeset viewer.