Changeset 38478 for main/trunk/greenstone2/perllib/plugins/BaseMediaConverter.pm

Timestamp:

2023-12-06T22:23:05+13:00 (5 months ago)

Author:

anupama

Message:

Related to the previous 2 commits. Removed or commented out most debug statements, only one remains (the final filepath within the cache dir for a file that has been determined by the new subroutine). Adjusted the new subroutine's description.

File:

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

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

@@ -76 +76 @@
 
 
-# given the file location where media or other product files are generated
-# (such as the pages of a PDF file converted to paged images), this returns
-# the full path to the document's cache subdirectory they are to be stored
-# e.g. collect/<collection>/cached>/<fileRootname>
+# This method exists to prevent duplication of long filepaths within the cache dir.
+# Given the file location where media or other product files to be cached are generated
+# (such as the pages of a PDF file converted to paged images), this subroutine returns
+# the relative path the document is to be stored as, within the cache subdirectory.
+# e.g. collect/<collection>/cached/<fileroot/numbered-filename.ext>
+# will return fileroot/numbered-filename.ext
+# e.g.#2 collect/<collection>/import/<fileroot.ext> will return fileroot.ext
 sub get_cache_filename_for_location
 {
@@ -114 +117 @@
     # reverse sort as we want to try matching more specific "$coll_dir/$subdir" before $coll_dir
     
-    print STDERR "@@@ Key and value: $key\n\t $prefixre_to_replacere_map{$key}\n";
+    #print STDERR "@@@ Key and value: $key\n\t $prefixre_to_replacere_map{$key}\n";
 
     my $prefixre = $key;
@@ -121 +124 @@
     ($file) = ($filename =~ m/$prefixre/);
     if (!defined $file || $file eq $filename) {
-        print STDERR "\t#### No match\n"; # keep looping looking for the next match
+        #print STDERR "\t#### No match\n"; # keep looping looking for the next match
+        next;
     } else {
-        print STDERR "\t#### Found match. Applying: $replacere\n";
+        #print STDERR "\t#### Found match. Applying: $replacere\n";
         if($replacere eq $orig_file_root_replacere) {
         $file = $orig_file_root_replacere.$file if $file;
@@ -140 +144 @@
     $file =~ s/^\/|\\//; # get rid of leading slash from relative filename
     $file =~ s@^(\.(\/|\/))*@@; # get rid of any ./ at the start
-    print STDERR "\tXXXX final file is: $file\n";
+    print STDERR "\t@@@ Final cache tail file is: $file\n";
 
     return $file
@@ -160 +164 @@
     $filename =~ s/\\/\//g;
     $base_dir =~ s/\\/\//g;
-    print STDERR "@@@@ col_dir    : $collect_dir\n";
-    print STDERR "@@@@ filename: $filename\n";
-
+    
     my $file = $self->get_cache_filename_for_location($filename, $orig_file_root, $base_dir, $collect_dir);
 
@@ -180 +182 @@
 
     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 ) {
@@ -190 +191 @@
 
 
-    print STDERR "@@@@ base_output_dir: $base_output_dir\n";
-    print STDERR "@@@@ file_root: $file_root\n";
+    #print STDERR "@@@@ base_output_dir: $base_output_dir\n";
+    #print STDERR "@@@@ file_root: $file_root\n";
 
     my $output_dir = &FileUtils::filenameConcatenate($base_output_dir,$file_root);