Changeset 7929

Timestamp:

2004-08-10T16:37:58+12:00 (20 years ago)

Author:

davidb

Message:

doc.pm modified so filename stored under gsdlsourcefilename is local
to collection.

Location:

trunk/gsdl/perllib

Files:

• doc.pm (modified) (1 diff)
• util.pm (modified) (1 diff)

trunk/gsdl/perllib/doc.pm

@@ -56 +56 @@
               'OIDtype'=>"hash"}, $class;
 
-    $self->set_source_filename ($source_filename) if defined $source_filename;
+    if (defined $source_filename) {
+    my $collect_dir = $ENV{'GSDLCOLLECTDIR'};
+
+    if (defined $collect_dir) {
+        my $dirsep = &util::get_dirsep();
+        if ($collect_dir !~ m/$dirsep$/) {
+        $collect_dir .= $dirsep;
+        }
+
+        $collect_dir =~ s/\\/\\\\/g; # escape DOS style file separator
+
+        if ($source_filename =~ /^$collect_dir(.*)$/) {
+        $source_filename = $1;
+        }
+    }
+
+    $self->set_source_filename ($source_filename);
+    }
+
     $self->set_doc_type ($doc_type) if defined $doc_type;
 

trunk/gsdl/perllib/util.pm

@@ -531 +531 @@
 }
 
+sub get_dirsep {
+
+    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
+    return "\\";
+    } else {
+    return "\/";
+    }
+}
+
 sub get_os_dirsep {