Changeset 15874

Timestamp:

2008-06-05T09:46:07+12:00 (16 years ago)

Author:

kjdon

Message:

replaced some code with equivalent method from util (filename_within_collection)

File:

• gsdl/trunk/perllib/doc.pm (modified) (1 diff)

gsdl/trunk/perllib/doc.pm

@@ -65 +65 @@
     
     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 from within GSDLCOLLECTDIR, then remove directory prefix
-        # so source_filename is realative to it.  This is done to aid
-        # portability, i.e. the collection can be moved to somewhere
-        # else on the file system and the archives directory will still
-        # work.  This is needed, for example in the applet version of
-        # GLI where GSDLHOME/collect on the server will be different to
-        # the collect directory of the remove user.  Of course,
-        # GSDLCOLLECTDIR subsequently needs to be put back on to turn
-        # it back into a full pathname.
-
-        if ($source_filename =~ /^$collect_dir(.*)$/) {
-        $source_filename = $1;
-        }
-    }
-
+    $source_filename = &util::filename_within_collection($source_filename);
     $self->set_source_filename ($source_filename);
     }