Changeset 30427 for main/trunk/greenstone2/perllib

Timestamp:

2016-03-22T16:21:47+13:00 (8 years ago)

Author:

davidb

Message:

Technique for working out cached-dir name for file updated to allow it to work in the situation where sub-directories are used within the original 'import; folder

File:

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

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

@@ -88 +88 @@
     $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;
-    $base_dir =~ s/\\/\//g;
+    $base_dir =~ 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(.*?)$/);
+    my $cached_dir = &FileUtils::filenameConcatenate($collect_dir,"cached");
+    ($file) = ($filename =~ m/^$cached_dir(.*?)$/);
+    # A cached name already has the fileroot baked -in as the last directory name
+    # => strip it out
+    $file =~ s/[\/\\][^\/\\]+([\/\\][^\/\\]*)$/$1/;
+
+#       Commented out code is the previous version that looked to
+#       handle this situation, but ran foul of situtation where
+#       sub-directories within 'import' are used
+#
+#   # Perhaps the filename is taken from within cache_dir area?
+#   my $prev_cached_dir = $self->{'cached_dir'};
+#   ($file) = ($filename =~ m/^$prev_cached_dir(.*?)$/);
     }
 
@@ -108 +117 @@
     my ($file_root, $dirname, $suffix)
     = &File::Basename::fileparse($file, "\\.[^\\.]+\$");
-
 
     # if dirname is in collections tmp area, remove collect_dir prefix
@@ -119 +127 @@
 
     my $base_output_dir = &FileUtils::filenameConcatenate($collect_dir,"cached",$dirname);
+##    my $base_output_dir = &FileUtils::filenameConcatenate($collect_dir,"cached",$dirname);
 
     if (!-e $base_output_dir ) {