Changeset 27350

Timestamp:

2013-05-16T14:33:31+12:00 (11 years ago)

Author:

kjdon

Message:

removing the J from directory name for dirname option for OID. If there are only digits will get a D in front.

File:

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

main/trunk/greenstone2/perllib/doc.pm

@@ -420 +420 @@
         $OID = &util::tidy_up_oid($OID);
     } elsif ($self->{'OIDtype'} eq "dirname") {
-        $OID = 'J';
         my $filename = $self->get_source_filename();
         if (defined($filename)) { # && -e $filename) {
+        # get the immediate parent directory
         $OID = &File::Basename::dirname($filename);
         if (defined $OID) {
-            $OID = 'J'.&File::Basename::basename($OID);
+            $OID = &File::Basename::basename($OID);
             $OID = &util::tidy_up_oid($OID);
         } else {
@@ -432 +432 @@
         }
         } else {
-        print STDERR "Failed to find filename, generating hash id\n";
+        print STDERR "Failed to find a filename, generating hash id\n";
         $use_hash_oid = 1;
         }