Changeset 36373 for main/trunk/greenstone2/perllib/plugins/OAIPlugin.pm

Timestamp:

2022-08-16T19:45:27+12:00 (21 months ago)

Author:

kjdon

Message:

now I have removed commented out code from last commit

File:

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

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

@@ -30 +30 @@
 #use Devel::Peek;
 use Encode;
-use extrametautil;
 use unicode;
 use util;
@@ -271 +270 @@
     $self->store_meta_in_extrametadata($filename_for_metadata, $new_metadata, undef, undef, $extrametakeys, $extrametadata, $extrametafile);
     }
-    # Extrametadata keys should be regular expressions
-    # 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) {
-    $filename_for_metadata = &util::filepath_to_url_format($filename_for_metadata);
-    $filename_for_metadata = &util::filename_to_regex($filename_for_metadata);
-
-    # Check that we haven't already got some metadata
-    if (defined &extrametautil::getmetadata($extrametadata, $filename_for_metadata)) {
-    print STDERR "\n****  OAIPlugin: Need to merge new metadata with existing stored metadata: file = $filename_for_metadata\n" if $verbosity > 3;
-
-    my $file_metadata_table = &extrametautil::getmetadata($extrametadata, $filename_for_metadata);
-
-    foreach my $metaname (keys %{$new_metadata}) {
-        # will create new entry if one does not already exist
-        push(@{$file_metadata_table->{$metaname}}, @{$new_metadata->{$metaname}});      
-    }
-
-    } else {
-    &extrametautil::setmetadata($extrametadata, $filename_for_metadata, $new_metadata);
-    &extrametautil::addmetakey($extrametakeys, $filename_for_metadata);
-    }
-
-    if ($srcdoc_exists) {   
-#   if (!defined &extrametautil::getmetafile($extrametafile, $filename_for_metadata)) {
-#       &extrametautil::setmetafile($extrametafile, $filename_for_metadata, {});
-#   }
-     #maps the file to full path
-#   &extrametautil::setmetafile_for_named_file($extrametafile, $filename_for_metadata, $file, $filename_full_path);
-    &extrametautil::addmetafile($extrametafile, $filename_for_metadata, $file, $filename_full_path);
-    
-    }
-    } # if 0
 
     return 1;