Changeset 36372 for main/trunk/greenstone2/perllib/plugins/LOMPlugin.pm

Timestamp:

2022-08-16T19:38:05+12:00 (21 months ago)

Author:

kjdon

Message:

tidy up of extrametautil, renaming some methods to make them easier to understand, removing anything unused. then modifying plugins to use new methods. Also, moved some common code to MetadataRead function, can call this from several plugins instead of duplicating code. This is an interim commit, where I have left in the old code to make it easier to track changes. Next commit will have everything tidied up.

File:

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

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

@@ -171 +171 @@
     }
     
+    if (defined $lom_srcdoc) {
+    $self->store_meta_in_extrametadata($filename_re, $self->{'saved_metadata'}, $file, $filename_full_path, $extrametakeys, $extrametadata, $extrametafile);
+    } else {
+    $self->store_meta_in_extrametadata($filename_for_metadata, $self->{'saved_metadata'}, undef, undef, $extrametakeys, $extrametadata, $extrametafile);
+    }
+    $self->{'lom_srcdoc'} = undef; # reset for next file to be processed
     # Indexing into the extrameta data structures requires the filename's style of slashes to be in URL format
     # Then need to convert the filename to a regex, no longer to protect windows directory chars \, but for
     # protecting special characters like brackets in the filepath such as "C:\Program Files (x86)\Greenstone".
+    if (0) {
     $file_re = &util::filepath_to_url_format($file_re);
     $file_re = &util::filename_to_regex($file_re);
@@ -188 +195 @@
     &extrametautil::setmetafile_for_named_file($extrametafile, $file_re, $file, $filename_full_path);
     }
-    
+    }
     return 1;
 }