Changeset 36095 for main

Timestamp:

2022-03-10T18:18:07+13:00 (2 years ago)

Author:

kjdon

Message:

look for files in collection/tmp folder, as well as import, and cache folders.

File:

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

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

@@ -80 +80 @@
     my $self = shift @_;
     my ($filename) = @_;
-
+    
     my $verbosity = $self->{'verbosity'};
     my $outhandle = $self->{'outhandle'};
@@ -99 +99 @@
     # A cached name already has the fileroot baked -in as the last directory name
     # => strip it out
-    $file =~ s/[\/\\][^\/\\]+([\/\\][^\/\\]*)$/$1/;
-
+        if (defined $file) {
+            $file =~ s/[\/\\][^\/\\]+([\/\\][^\/\\]*)$/$1/;
+        }
 #       Commented out code is the previous version that looked to
 #       handle this situation, but ran foul of situtation where
@@ -109 +110 @@
 #   ($file) = ($filename =~ m/^$prev_cached_dir(.*?)$/);
     }
-
+    if (!defined $file) {
+        # perhaps the filename is in the tmp folder? This can happen if the file was in a zip inside the import folder, eg as happens with remote gli
+        ($file) = ($filename =~ m/^$collect_dir\/(tmp\/.*?)$/);
+
+    }
     $file =~ s/^\/|\\//; # get rid of leading slash from relative filename