Changeset 23484


Ignore:
Timestamp:
12/14/10 15:24:37 (10 years ago)
Author:
ak19
Message:

Further improvements by Dr Bainbridge to pretty-printing.

Location:
main/trunk/greenstone2/perllib
Files:
3 edited

Legend:

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

    r23472 r23484  
    10421042
    10431043    # should we move this to read? What about secondary plugins?
     1044    my $pp_file = &util::prettyprint_file($base_dir,$file,$gli);
    10441045    print STDERR "<Processing n='$file' p='$self->{'plugin_type'}'>\n" if ($gli);
    1045     my $pp_file = &util::prettyprint_file($base_dir,$file);
    10461046    print $outhandle "$self->{'plugin_type'} processing $pp_file\n"
    10471047    if $self->{'verbosity'} > 1;
  • main/trunk/greenstone2/perllib/plugins/ReadTextFile.pm

    r23387 r23484  
    122122    # should we move this to read? What about secondary plugins?
    123123    print STDERR "<Processing n='$file' p='$self->{'plugin_type'}'>\n" if ($gli);
    124     my $pp_file = &util::prettyprint_file($base_dir,$file);
     124    my $pp_file = &util::prettyprint_file($base_dir,$file,$gli);
    125125    print $outhandle "$self->{'plugin_type'} processing $pp_file\n"
    126126        if $self->{'verbosity'} > 1;
  • main/trunk/greenstone2/perllib/util.pm

    r23483 r23484  
    502502
    503503    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
     504       
    504505    # symlink not supported on windows
    505506    &File::Copy::copy ($src, $dest);
     
    10731074sub prettyprint_file
    10741075{
    1075     my ($base_dir,$file) = @_;
     1076    my ($base_dir,$file,$gli) = @_;
    10761077
    10771078    my $filename_full_path = &util::filename_cat($base_dir,$file);
     
    10881089
    10891090    $file = filename_within_directory($long_full_path,$long_base_dir);
     1091    $file = encode("utf8",$file) if ($gli);
    10901092    }
    10911093
Note: See TracChangeset for help on using the changeset viewer.