Changeset 16670

Timestamp:

2008-08-07T13:42:35+12:00 (16 years ago)

Author:

ak19

Message:

Instead of base64 encoding the gsdl_source_filename, it now URL encodes it. GLI's DocXMLFile.java urlDecodes it now (instead of applying base64 decoding).

File:

• gsdl/trunk/perllib/doc.pm (modified) (5 diffs)

gsdl/trunk/perllib/doc.pm

@@ -39 +39 @@
 use ghtml;
 use File::stat;
-use MIME::Base64;
 ##use hashdoc;
 use docprint;
@@ -151 +150 @@
     # For instance, if this meta element (gsdlsourcefilename) will be 
     # used by other applications that parse doc.xml in order to locate 
-    # gsdlsourcefilename. Therefore, the solution is to encode the real
-    # filename into Base64 encoding which is a binary-to-text encoding, 
-    # meaning that the resulting string is ASCII (utf8). See also 
-    # MIME#Content-Transfer-Encoding in Wiki.
-    
-    print STDERR "******Base64 encoding the non-utf8 gsdl_source_filename $source_filename ";
-    
-    # remove "import/" from path, base 64 encode just the source_filename 
-    # (remove trailing spaces and newlines) and prefix "import/" again. 
-    my $import_dir = "import";
-    my $srcfilename = $source_filename;
-    $srcfilename =~ s/^$import_dir(?:\\|\/)+(.*)$/$1/;
-    
+    # gsdlsourcefilename. Therefore, the solution is to URLencode the real
+    # filename as this is a binary-to-text encoding meaning that the 
+    # resulting string is ASCII (utf8).
+    
+    print STDERR "******URLencoding the gsdl_source_filename $source_filename ";
+    
+    # URLencode just the gsdl_source_filename, not the directory. Then prepend dir 
+    my ($srcfilename,$dirname,$suffix) 
+    = &File::Basename::fileparse($source_filename, "\\.[^\\.]+\$");
     print STDERR "-> $srcfilename -> ";
-    $srcfilename = &MIME::Base64::encode_base64($srcfilename);
-    $srcfilename =~ s/\s*//sg; # for some reason it adds spaces not just at end but also in middle
-        
-    $source_filename = &util::filename_cat($import_dir, $srcfilename);
+    $srcfilename = &unicode::url_encode($srcfilename.$suffix);
+    $source_filename = &util::filename_cat($dirname, $srcfilename);
     print STDERR "$source_filename\n";
-    
+    
     $self->set_utf8_metadata_element ($self->get_top_section(), 
                  "gsdlsourcefilename", 
@@ -205 +198 @@
     if (defined $plugin_name && $plugin_name eq "NULPlug") {
         $filename = undef;
-    } else {
+    } else { # returns the URL encoded source filename!
         $filename = $self->get_metadata_element ($self->get_top_section(), "gsdlsourcefilename");
     }
@@ -276 +269 @@
     $result = `hashfile$osexe \"$filename\"`;
     ($result) = $result =~ /:\s*([0-9a-f]+)/i;
-
     } else {
     print STDERR "doc::_calc_OID $hashfile_exe could not be found\n";
@@ -854 +846 @@
     # double check that the value is utf-8
     if (!&unicode::check_is_utf8($value)) {
-    print STDERR "doc::add_utf8_metadata - warning: '$field''s value $value wasn't utf8. ";
+    print STDERR "doc::add_utf8_metadata - warning: '$field''s value $value wasn't utf8.";
     &unicode::ensure_utf8(\$value);
-    print STDERR "Tried converting to utf8: $value\n";
+    print STDERR " Tried converting to utf8: $value\n";
     }