Changeset 16920

Timestamp:

2008-08-20T17:37:34+12:00 (16 years ago)

Author:

ak19

Message:

1. When checking whether the original_file is missing, it ensures that is defined. 2. Uses the new unicode::filename_to_url() subroutine.

File:

• gsdl/trunk/perllib/plugins/HTMLPlugin.pm (modified) (2 diffs)

gsdl/trunk/perllib/plugins/HTMLPlugin.pm

@@ -1118 +1118 @@
     # try the original filename stored in map
     my $original_filename = $self->{'utf8_to_original_filename'}->{$filename};
-    if (-e $original_filename) {
+#   print STDERR "*** missing: $filename" unless defined $original_filename; #StrangeNoGraphicData in word doc
+    if (defined $original_filename && -e $original_filename) {
         $filename = $original_filename;
     }
@@ -1167 +1168 @@
     # of filenames, URL-encode the additional percent signs of the URL-encoded filename
     my $newname_url = $newname;
-    $newname_url =~ s/%/%25/g if $newname_url !~ m/%25/;
+    $newname_url = &unicode::filename_to_url($newname_url); #$newname_url =~ s/%/%25/g if $newname_url !~ m/%25/;
     return "_httpdocimg_/$newname_url"; 
     }