Changeset 38477 for main/trunk/greenstone2

Timestamp:

2023-12-06T22:05:16+13:00 (6 months ago)

Author:

anupama

Message:

Related to the previous commit. Calling the new subroutine to tidy up cached filename paths to avoid internal path duplication (that used to produce very long filepaths inside the cache directory). And the new subroutine finally retuns the file parameter it had been working out.

File:

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

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

@@ -103 +103 @@
     $prefixre_to_replacere_map{qr/^$collect_dir(.*?)$/} = "";
     $prefixre_to_replacere_map{qr@^$ENV{'GSDLHOME'}/tmp/[^/]*(.*?)$@} = $orig_file_root_replacere; # prefix this
-    #%prefixre_to_replacere_map{qr//} = qr//;
-
+    #$prefixre_to_replacere_map{qr/^$ENV{'GSDLHOME'}(.*?)$/} = ""; # Not found a real-world use for this yet
+    #$prefixre_to_replacere_map{qr//} = qr//; # dummy template line to add additional regex match processing rules
+    
     my $file;
     
@@ -140 +141 @@
     $file =~ s@^(\.(\/|\/))*@@; # get rid of any ./ at the start
     print STDERR "\tXXXX final file is: $file\n";
+
+    return $file
 }
 
@@ -160 +163 @@
     print STDERR "@@@@ filename: $filename\n";
 
-#    $self->get_cache_filename_for_location($filename, $orig_file_root, $base_dir, $collect_dir);
-    
-    my ($file) = ($filename =~ m/^$base_dir(.*?)$/);
-
-    print STDERR "@@@@ orig_file_root : $orig_file_root\n" if $orig_file_root;
-    print STDERR "@@@@ file    : $file\n";
-    print STDERR "@@@@ base_dir: $base_dir\n";
-    
-    if (!defined $file || $file eq $filename) {
-    # Perhaps the filename is taken from within cache_dir area?
-    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
-        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
-#       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(.*?)$/);
-    }
-    if (!defined $file || $file eq $filename) {
-        # perhaps the filename is in the tmp folder? This can happen if the file was in a zip inside the import folder, e.g. as happens with remote gli
-        ($file) = ($filename =~ m/^$collect_dir\/(tmp\/.*?)$/);
-
-    }
-    
-    print STDERR "@@@@ file mid: $file\n" if defined $file;
-
-    
-    if(!defined $file || $file eq $filename) {
-    ($file) = ($filename =~ m/^$collect_dir(.*?)$/);    
-    print STDERR "@@@@ file    : $file\n" if $file;
-    }
-    if($orig_file_root && !defined $file || $file eq $filename) {
-        ($file) = ($filename =~ m@^$ENV{'GSDLHOME'}/tmp/[^/]*(.*?)$@);
-        #$file = "/$orig_file_root/resized".$file if $file;
-    $file = "/$orig_file_root".$file if $file;
-        print STDERR "@@@@ file FIN: $file\n" if $file;
-    }
-    #if(!defined $file || $file eq $filename) {
-    #   ($file) = ($filename =~ m/^$ENV{'GSDLHOME'}(.*?)$/);    
-    #   print STDERR "@@@@ file FIN: $file\n" if $file;
-    #}
-    if(!defined $file) {
-    $file = $filename;
-    }
-    
-    $file =~ s/^\/|\\//; # get rid of leading slash from relative filename
-    $file =~ s@^(\.(\/|\/))*@@; # get rid of any ./ at the start
-    
-    print STDERR "@@@@ FIN file : $file\n";
-
-    
+    my $file = $self->get_cache_filename_for_location($filename, $orig_file_root, $base_dir, $collect_dir);
+
     # Setup cached_dir and file_root