Changeset 19617 for gsdl/trunk/perllib/doc.pm

Timestamp:

2009-05-27T13:56:41+12:00 (15 years ago)

Author:

kjdon

Message:

use new util::tidy_up_oid instead of fiddling with it directly

File:

• gsdl/trunk/perllib/doc.pm (modified) (2 diffs)

gsdl/trunk/perllib/doc.pm

@@ -300 +300 @@
         if (defined $OID) {
             $OID = 'J'.&File::Basename::basename($OID);
-            $OID =~ s/\.//; #remove any periods
+            $OID = &util::tidy_up_oid($OID);
         } else {
             print STDERR "Failed to find base for filename ($filename)...generating hash id\n";
@@ -314 +314 @@
         if (defined $identifier && $identifier ne "") {
         $OID = $identifier;
-        if ($OID =~ /\./) {
-            print STDERR "Warning, assigned identifier $identifier contains periods (.), removing them\n";
-            $OID =~ s/\.//g; #remove any periods
-        }
-        if ($OID =~ /^[\d]*$/) {
-            print STDERR "Warning, assigned identifier $identifier contains only digits. Prepending 'D'.\n";
-            $OID = "D" . $OID;
-        }       
+        $OID = &util::tidy_up_oid($OID);
         } else {
         # need a hash id