Changeset 38745 for main/trunk

Timestamp:

2024-02-14T16:44:10+13:00 (4 months ago)

Author:

davidb

Message:

Rule mapping code extended to now allow a match or substitute prefix to the rule

File:

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

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

@@ -190 +190 @@
     
     if (($num_csv_entries == 5) || ($num_csv_entries >= 6 && $csv_entries[4] =~ m/\s*#.*$/)) {
+
         my $src_metadata_name  = $csv_entries[0];
-        (my $src_metadata_regex = $csv_entries[1]) =~ s/(^\/)|(\/$)//g; #assigns as a /qr (quoted regex) and then strips off leading and trailing slash
-        (my $dst_metadata_regex = $csv_entries[2]) =~ s/(^\/)|(\/$)//g; #as line above
-        (my $regex_modifiers    = $csv_entries[3]) =~ s/(^')|('$)//g;   #similar to above but strips out single quotes
+        my ($regex_type,$src_metadata_regex) = ($csv_entries[1] =~ m/^(s|m)\/(.*)\/$/); # use matching to extract regex_type ('s' or 'm') and src_metadata_regex
+        (my $dst_metadata_regex = $csv_entries[2]) =~ s/(^\/)|(\/$)//g; # strips off leading and trailing slash
+        (my $regex_modifiers    = $csv_entries[3]) =~ s/(^')|('$)//g;   # similar to above but strips out single quotes
         my $dst_metadata_name  = $csv_entries[4];
 
-        # If the last entry has a '# comments' after it, needs a bit more string manipulation
-        # to tidy it up
-        $dst_metadata_name =~ s/#.*$//;
-        $dst_metadata_name =~ s/\s*$//;
-        
-        my $regex_sub = "s/$src_metadata_regex/$dst_metadata_regex/$regex_modifiers";
-
-        my $metadata_mapping_rule_rec = {
-        "src_metadata_name" => $src_metadata_name,
-        "regex_sub"         => $regex_sub,
-        "dst_metadata_name" => $dst_metadata_name           
-        };
-            
-        push(@$metadata_mapping_rules,$metadata_mapping_rule_rec);
+        if ((defined $regex_type) && (defined $src_metadata_regex)) {
+        # If the last entry has a '# comments' after it, needs a bit more string manipulation
+        # to tidy it up
+        $dst_metadata_name =~ s/#.*$//;
+        $dst_metadata_name =~ s/\s*$//;
+        
+        my $regex_sub = "s/$src_metadata_regex/$dst_metadata_regex/$regex_modifiers";
+
+        my $metadata_mapping_rule_rec = {
+            "regex_type"        => $regex_type,
+            "src_metadata_name" => $src_metadata_name,
+            "regex_sub"         => $regex_sub,
+            "dst_metadata_name" => $dst_metadata_name           
+        };
+
+        if ($regex_type eq "m") {
+            my $regex_match = "m/$src_metadata_regex/";
+            $metadata_mapping_rule_rec->{"regex_match"} = $regex_match;
+        }
+        
+        push(@$metadata_mapping_rules,$metadata_mapping_rule_rec);
+        }
+        else {
+        print STDERR "Warning: syntax error in $metadata_mapping_full_filename, line $line_num\n";
+        print STDERR "  $csv_line\n";
+        print STDERR "Did not specify source metadata regular expression entry inside slashes, e.g., s/(-|_)/\n";
+        if (!defined $regex_type) {
+            print STDERR "Prefix to source metadata regular expression entry must be either s/ or m/ for substitute or match respectively\n";
+        }
+        }
     }
     else {
@@ -801 +818 @@
     
     foreach my $metadata_mapping_rule_rec (@$metadata_mapping_rules) {
-        
+
+    my $regex_type = $metadata_mapping_rule_rec->{"regex_type"};
+    my $regex_match = undef;
+    if ($regex_type eq "m") {
+        $regex_match = $metadata_mapping_rule_rec->{"regex_match"};
+    }
+    
     my $src_metadata_name = $metadata_mapping_rule_rec->{"src_metadata_name"};
     my $dst_metadata_name = $metadata_mapping_rule_rec->{"dst_metadata_name"};
@@ -811 +834 @@
     foreach my $metadata_val (@$metadata_vals) {
 
+        if (defined $regex_match) {
+        if ($verbosity >= 4) {
+            print $outhandle "    Applying match guard: '$metadata_val' must match $regex_match ...\n"
+        }
+        my $match_guard = 0;
+
+        # print STDERR "***** \$match_guard = 1 if \$metadata_val =~ $regex_match\n" ;
+        eval ( "\$match_guard = 1 if (\$metadata_val =~ $regex_match)" );
+        if ($@) {
+            warn "$@";
+        }
+        if ($match_guard) {
+            if ($verbosity >= 4) {
+            print $outhandle "    ... Matched!\n"
+            }
+        }
+        else {
+            if ($verbosity >= 4) {
+            print $outhandle "    ... Did not match\n"
+            }
+            next;
+        }
+        }
+        
         my $store_metadata_val = $metadata_val;
+
         
         if ($verbosity >= 4) {
-        print $outhandle "    Testing for match with: \$metadata_val =~ $regex_sub\n"
+        print $outhandle "    Testing '$store_metadata_val' for match with: \$metadata_val =~ $regex_sub\n"
         }
         eval ( "\$metadata_val =~ $regex_sub" );