Changeset 29112 for main/trunk

Timestamp:

2014-07-03T14:36:25+12:00 (10 years ago)

Author:

kjdon

Message:

when tidying up OIDs, replace periods with _ instead of just removing it, otherwise 10.1 will end up the same as 1.01. Do the same thing for forward and back slashes - these screw up folders/URls etc

File:

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

main/trunk/greenstone2/perllib/util.pm

@@ -447 +447 @@
 sub tidy_up_oid {
     my ($OID) = @_;
-    if ($OID =~ /\./) {
-    print STDERR "Warning, identifier $OID contains periods (.), removing them\n";
-    $OID =~ s/\.//g; #remove any periods
+    if ($OID =~ /[\.\/\\]/) {
+    print STDERR "Warning, identifier $OID contains periods or slashes(.\\\/), replacing them with _\n";
+    $OID =~ s/[\.\\\/]/_/g; #remove any periods
     }
     if ($OID =~ /^\s.*\s$/) {