Changeset 24350 for main

Timestamp:

2011-07-29T13:16:32+12:00 (13 years ago)

Author:

davidb

Message:

Tweak on working out what the output-cached directory should be for a given file which allows for input files to already be in the output-cache area, rather than (as is more usual) be in the 'import' folder

File:

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

main/trunk/greenstone2/perllib/plugins/BaseMediaConverter.pm

@@ -84 +84 @@
     my $outhandle = $self->{'outhandle'};
     my $base_dir = $self->{'base_dir'};
+
+    my $collect_dir = $ENV{'GSDLCOLLECTDIR'};
+    $collect_dir =~ s/\\/\//g; # Work in Unix style world
     
+##    print STDERR "**** base_dir = ", $base_dir, "\n";
+ 
     # Work out relative filename within 'base_dir'
     $filename =~ s/\\/\//g;
     my ($file) = ($filename =~ m/^$base_dir(.*?)$/);
     
+    if (!defined $file) {
+    # Perhaps the filename is taken from within cache_dir area?
+    my $prev_cached_dir = $self->{'cached_dir'};
+    ($file) = ($filename =~ m/^$prev_cached_dir(.*?)$/);
+    }
+
     $file =~ s/^\/|\\//; # get rid of leading slash from relative filename
+
 
     # Setup cached_dir and file_root
@@ -96 +108 @@
     = &File::Basename::fileparse($file, "\\.[^\\.]+\$");
 
-    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