Changeset 16426 for gsdl/trunk/perllib/plugouts

Timestamp:

2008-07-16T13:25:56+12:00 (16 years ago)

Author:

ak19

Message:

Minor changes. Although it may not be necessary, using filename_cat to ensure that a filename that is only going to be replaced by a regular expression is still properly created for Windows

File:

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

gsdl/trunk/perllib/plugouts/FedoraMETSPlugout.pm

@@ -537 +537 @@
     }
     
-    my $gsdl_href = "$working_dir/$fname";
+    my $gsdl_href = &util::filename_cat($working_dir, $fname);
     $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
@@ -665 +665 @@
            }
 
-           my $gsdl_href = "$working_dir/$assfilePath";
+           my $gsdl_href = &util::filename_cat($working_dir,$assfilePath);
            $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'};