Changeset 36478 for main/trunk

Timestamp:

2022-08-25T08:39:44+12:00 (20 months ago)

Author:

kjdon

Message:

don't allow whitespace inside an OID

File:

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

main/trunk/greenstone2/perllib/util.pm

@@ -527 +527 @@
     if ($OID =~ /[\.\/\\]/) {
     print STDERR "Warning, identifier $OID contains periods or slashes(.\\\/), replacing them with _\n";
-    $OID =~ s/[\.\\\/]/_/g; #remove any periods
+    $OID =~ s/[\.\\\/]/_/g; #replace periods and slasshes with _
     }
     if ($OID =~ /^\s.*\s$/) {
@@ -534 +534 @@
     $OID =~ s/^\s+//;
     $OID =~ s/\s+$//;
+    }
+    if ($OID =~ /\s/) {
+    print STDERR "Warning, identifier $OID contains whitespace. Replacing it with _\n";
+    $OID =~ s/\s+/_/g; # replace whitespace with _
     }
     if ($OID =~ /^[\d]*$/) {