Changeset 38743 for main/trunk

Timestamp:

2024-02-14T12:04:58+13:00 (3 months ago)

Author:

davidb

Message:

Tweak after testing -- handles a comment at the end of a line better

File:

• main/trunk/greenstone2/perllib/plugins/BaseImporter.pm (modified) (1 diff)

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

@@ -189 +189 @@
     # print STDERR join(",",@tsv_entries), "\n\n";
     
-    if (($num_csv_entries == 5) || ($num_csv_entries >= 6 && $csv_entries[5] =~ m/^#/)) {
+    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