Changeset 27306 for main/trunk/greenstone2/perllib/doc.pm
- Timestamp:
- 2013-05-06T15:29:38+12:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/doc.pm
r26850 r27306 37 37 use unicode; 38 38 use util; 39 use FileUtils; 39 40 use ghtml; 40 41 use File::stat; … … 89 90 $self->{'terse_source_path'} = $source_filename; 90 91 92 # Use the FileUtil library methods as they are aware of more special 93 # cases such as HDFS [jmt12] 94 ##if (&util::file_exists($source_filename)) { 91 95 if (-e $source_filename) { 92 96 # See if we can do better for Windows with a filename … … 241 245 # print STDERR "-> $srcfilename -> "; 242 246 # $srcfilename = &util::rename_file($srcfilename.$suffix, $rename_method); 243 # $source_filename = & util::filename_cat($dirname, $srcfilename);247 # $source_filename = &FileUtils::filenameConcatenate($dirname, $srcfilename); 244 248 # print STDERR "$source_filename\n"; 245 249 … … 257 261 # print STDERR "-> $srcfilename -> "; 258 262 $srcfilename = &util::rename_file($srcfilename.$suffix, $rename_method); 259 $source_filename = & util::filename_cat($dirname, $srcfilename);263 $source_filename = &FileUtils::filenameConcatenate($dirname, $srcfilename); 260 264 261 265 return $source_filename; … … 304 308 } 305 309 306 if (!& util::filename_is_absolute($filename)) {307 $filename = & util::filename_cat($ENV{'GSDLCOLLECTDIR'},$filename);310 if (!&FileUtils::isFilenameAbsolute($filename)) { 311 $filename = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'},$filename); 308 312 } 309 313 … … 367 371 my $osexe = &util::get_os_exe(); 368 372 369 my $hashfile_exe = & util::filename_cat($ENV{'GSDLHOME'},"bin",373 my $hashfile_exe = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"bin", 370 374 $ENV{'GSDLOS'},"hashfile$osexe"); 371 375
Note:
See TracChangeset
for help on using the changeset viewer.