Changeset 23484 for main/trunk/greenstone2

Timestamp:

2010-12-14T15:24:37+13:00 (13 years ago)

Author:

ak19

Message:

Further improvements by Dr Bainbridge to pretty-printing.

Location:

main/trunk/greenstone2/perllib

Files:

• plugins/BasePlugin.pm (modified) (1 diff)
• plugins/ReadTextFile.pm (modified) (1 diff)
• util.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/plugins/BasePlugin.pm

@@ -1042 +1042 @@
 
     # should we move this to read? What about secondary plugins?
+    my $pp_file = &util::prettyprint_file($base_dir,$file,$gli);
     print STDERR "<Processing n='$file' p='$self->{'plugin_type'}'>\n" if ($gli);
-    my $pp_file = &util::prettyprint_file($base_dir,$file);
     print $outhandle "$self->{'plugin_type'} processing $pp_file\n"
     if $self->{'verbosity'} > 1;

main/trunk/greenstone2/perllib/plugins/ReadTextFile.pm

@@ -122 +122 @@
     # should we move this to read? What about secondary plugins?
     print STDERR "<Processing n='$file' p='$self->{'plugin_type'}'>\n" if ($gli);
-    my $pp_file = &util::prettyprint_file($base_dir,$file);
+    my $pp_file = &util::prettyprint_file($base_dir,$file,$gli);
     print $outhandle "$self->{'plugin_type'} processing $pp_file\n"
         if $self->{'verbosity'} > 1;

main/trunk/greenstone2/perllib/util.pm

@@ -502 +502 @@
 
     if ($ENV{'GSDLOS'} =~ /^windows$/i) {
+        
     # symlink not supported on windows
     &File::Copy::copy ($src, $dest);
@@ -1073 +1074 @@
 sub prettyprint_file
 {
-    my ($base_dir,$file) = @_;
+    my ($base_dir,$file,$gli) = @_;
 
     my $filename_full_path = &util::filename_cat($base_dir,$file);
@@ -1088 +1089 @@
 
     $file = filename_within_directory($long_full_path,$long_base_dir);
+    $file = encode("utf8",$file) if ($gli);
     }