Changeset 17015 for gsdl/trunk/perllib

Timestamp:

2008-08-26T19:49:25+12:00 (16 years ago)

Author:

ak19

Message:

Handles URL-encoded filenames now (since the xlink_href urls referring to these already URL-encoded filenames must be doubly-encoded).

File:

• gsdl/trunk/perllib/plugouts/FedoraMETSPlugout.pm (modified) (2 diffs)

gsdl/trunk/perllib/plugouts/FedoraMETSPlugout.pm

@@ -634 +634 @@
        $all_text .= "  <mets:fileGrp ID=\"$id_root\">\n";
        
-       my $assfilePath = ($assoc_dir eq "") ? $assoc_file : "$assoc_dir/$assoc_file";
+       # The assoc_file's name may be url-encoded, so the xlink_href in the <mets:FLocat>
+       # element must be the url to this (possibly url-encoded) filename
+       my $assocfile_url = &unicode::filename_to_url($assoc_file);
+       my $assfilePath = ($assoc_dir eq "") ? $assocfile_url : "$assoc_dir/$assocfile_url";
        ++$fileID;
        
@@ -675 +678 @@
            
            my $fdomain = "http://$fserver:$fport";
-           $xlink_href  = "xlink:href=\"$fdomain$gsdl_href\"";
+           $xlink_href = "xlink:href=\"$fdomain$gsdl_href\"";
        }
        
        my $top_section = $doc_obj->get_top_section();
        my $id = $doc_obj->get_metadata_element($top_section,"Identifier");
-
+       
        $all_text .= "    <mets:file $mime_attr $id_attr $opt_owner_id >\n";
        $all_text .= "      <mets:FLocat LOCTYPE=\"URL\" $xlink_href $xlink_title />\n";
-       
+
        $all_text .= "    </mets:file>\n";