Changeset 20001

Timestamp:

2009-07-17T10:15:31+12:00 (15 years ago)

Author:

davidb

Message:

When testing on Windows, discovered drive letter at start of filename caused problems. Now fixed

File:

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

gsdl/trunk/perllib/plugins/BaseMediaConverter.pm

@@ -98 +98 @@
 
     my $collect_dir = $ENV{'GSDLCOLLECTDIR'};
+    $collect_dir =~ s/\\/\//g; # Work in Unix style world
+
+    # if dirname is in collections tmp area, remove collect_dir prefix
+    $dirname =~ s/^$collect_dir//;
+
+    if ($ENV{'GSDLOS'} eq "windows") {
+    # if dirname starts with Windows drive letter, strip it off
+    $dirname =~ s/^[a-z]:\///i;
+    }
+
     my $base_output_dir = &util::filename_cat($collect_dir,"cached",$dirname);
 
@@ -117 +127 @@
 
     $self->{'cached_dir'} = $output_dir;
-    $self->{'cached_file_root'} = $file_root;
-    
+    $self->{'cached_file_root'} = $file_root;    
 }