Changeset 38476 for main/trunk/greenstone2/perllib/plugins/ImageConverter.pm

Timestamp:

2023-12-06T21:53:42+13:00 (7 months ago)

Author:

anupama

Message:

Tidying up cached filename paths that were internally duplicated. Thsi is the longer code that I've tested more thoroughly. I've now also added in the subroutine that Dr Bainbridge wanted with a hashmap that cleans up the filepath based on matching regex prefixes and determines the new relative file location and filename inside the cached subdirectory based on which regex in the hashmap matched. I will commit the longer code first (and the new function with the described hashmap, but it doesn't get called in this commit), in case I need to backtrack at any point. I will next commit the call to the function and remove the longer code.

File:

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

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

@@ -213 +213 @@
     my ($filename_full_path, $filename_encoded_full_path, $doc_obj, $section, $filename_encoding) = @_;
 
+    print STDERR "##### generate_images: filename full path = $filename_full_path\n";
+    
     my ($unused_fefp,$filename_encoded_no_path)
     = &util::get_full_filenames("",$filename_encoded_full_path);
@@ -230 +232 @@
 
     if ($self->{'enable_cache'}) {
-    $self->init_cache_for_file($filename_full_path);
+
+    if($self->{'orig_filename_full_path'}) {
+        my ($orig_file_root, $orig_dirname, $orig_suffix)
+        #= &File::Basename::fileparse($doc_obj->{'orig_source_filename'}, "\\.[^\\.]+\$");
+        = &File::Basename::fileparse($self->{'orig_filename_full_path'}, "\\.[^\\.]+\$");
+    
+        $self->init_cache_for_file($filename_full_path, $orig_file_root);
+    } else {
+        $self->init_cache_for_file($filename_full_path);
+    }
     }
     if ($self->{'store_file_paths'}) {