Changeset 15604 for gsdl/trunk/perllib/plugouts/FedoraMETSPlugout.pm

Timestamp:

2008-05-20T18:41:24+12:00 (16 years ago)

Author:

ak19

Message:

Change made to two locations: Corrected last commit: composition of gsdl_href by escaping backslashes before the substition and then making sure that at the end it is of a url (only forward slashes)

File:

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

gsdl/trunk/perllib/plugouts/FedoraMETSPlugout.pm

@@ -497 +497 @@
 
 
-
-
 sub doctxt_to_xlink
 {
@@ -522 +520 @@
 
     my $gsdl_href = "$working_dir/$fname";
-    
-    $collectparent =~ s/\\/|/g; # Temporarily replace any back slashes in the file path with | 
-    $gsdl_href =~ s/^$collectparent(\/)?//;
-    $gsdl_href = "/gsdl/$gsdl_href";
-    $collectparent =~ s/\|/\\/g; # Change the | in the file path back into backslashes
-    
+    $collectparent =~ s/\\/\\\\/g;             # escape reserved metacharacter \ in path (by replacing it with \\) for substitution
+    $gsdl_href =~ s/^$collectparent(\/|\\)?//; # remove the collectparent path in gsdl_href and any trailing slash
+    $gsdl_href =~ s/\\/\//g;                   # make sure we have url paths (which only use / not \)
+    $gsdl_href = "/gsdl/$gsdl_href";           # prepend gsdl
+        
     my $fserver = $ENV{'FEDORA_HOSTNAME'};
     my $fport = $ENV{'FEDORA_SERVER_PORT'};
@@ -646 +643 @@
 
            my $gsdl_href = "$working_dir/$assfilePath";
-           
-           $gsdl_href =~ s/^$collectparent(\/)?//;
-           $gsdl_href = "/gsdl/$gsdl_href";
-           
+           $collectparent =~ s/\\/\\\\/g;             # escape reserved metacharacter \ in path (by replacing it with \\) for substitution
+           $gsdl_href =~ s/^$collectparent(\/|\\)?//; # remove the collectparent path in gsdl_href and any trailing slash
+           $gsdl_href =~ s/\\/\//g;                   # make sure we have url paths (which only use / not \)
+           $gsdl_href = "/gsdl/$gsdl_href";           # prepend gsdl
+                   
            my $fserver = $ENV{'FEDORA_HOSTNAME'};
            my $fport = $ENV{'FEDORA_SERVER_PORT'};