Changeset 27306 for main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm
- Timestamp:
- 2013-05-06T15:29:38+12:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm
r25673 r27306 44 44 use unicode; 45 45 use util; 46 use FileUtils; 46 47 use XMLParser; 47 48 … … 229 230 # Turn relative file path into full path 230 231 my $dirname = &File::Basename::dirname($filename_full_path); 231 $raw_link = & util::filename_cat($dirname, $raw_link);232 $raw_link = &FileUtils::filenameConcatenate($dirname, $raw_link); 232 233 } 233 234 $raw_link = $self->eval_dir_dots($raw_link); … … 336 337 337 338 # set the file to be tidied 338 $input_filename = & util::filename_cat($base_dir,$file) if $base_dir =~ m/\w/;339 $input_filename = &FileUtils::filenameConcatenate($base_dir,$file) if $base_dir =~ m/\w/; 339 340 340 341 # get the tidied file … … 386 387 } 387 388 388 my $filename = & util::filename_cat($base_dir,$file);389 my $filename = &FileUtils::filenameConcatenate($base_dir,$file); 389 390 my $upgraded_base_dir = &util::upgrade_if_dos_filename($base_dir); 390 391 my $upgraded_filename = &util::upgrade_if_dos_filename($filename); … … 709 710 if(scalar(@styleTagsText) > 0) 710 711 { 711 my $css_filename_dirname = &File::Basename::dirname(& util::filename_cat($base_dir, $file));712 my $css_filename_dirname = &File::Basename::dirname(&FileUtils::filenameConcatenate($base_dir, $file)); 712 713 foreach my $styleText (@styleTagsText) 713 714 { … … 823 824 my $directory = &File::Basename::dirname($file); 824 825 825 my $css_filename = & util::filename_cat($base_dir, $directory, $actual_link);826 my $css_filename = &FileUtils::filenameConcatenate($base_dir, $directory, $actual_link); 826 827 $self->retrieve_css_associated_files($css_filename); 827 828 } … … 943 944 $img_url =~ s/^\s*"?([^"]*)"?\s*$/$1/; 944 945 945 $self->{'css_assoc_files'}->{& util::filename_cat($css_filename_dirname, $img_url)} = $img_url;946 $self->{'css_assoc_files'}->{&FileUtils::filenameConcatenate($css_filename_dirname, $img_url)} = $img_url; 946 947 } 947 948 } … … 980 981 } 981 982 982 $filename = & util::filename_cat($base_dir, $filename);983 $filename = &FileUtils::filenameConcatenate($base_dir, $filename); 983 984 984 985 if (($self->{'use_realistic_book'}) || ($self->{'old_style_HDL'})) { … … 1035 1036 # some special processing if the intended filename was converted to utf8, but 1036 1037 # the actual file still needs to be renamed 1037 if (!&util::fd_exists($filename)) { 1038 #if (!&util::fd_exists($filename)) { 1039 if (!&FileUtils::fileExists($filename)) { 1038 1040 # try the original filename stored in map 1039 1041 if ((defined $ENV{"DEBUG_UNICODE"}) && ($ENV{"DEBUG_UNICODE"})) { … … 1131 1133 # Turn url (using /) into file name (possibly using \ on windows) 1132 1134 my @http_dir_split = split('/', $before_hash); 1133 $before_hash = & util::filename_cat(@http_dir_split);1135 $before_hash = &FileUtils::filenameConcatenate(@http_dir_split); 1134 1136 } 1135 1137 1136 1138 $before_hash = $self->eval_dir_dots($before_hash); 1137 1139 1138 my $linkfilename = & util::filename_cat($base_dir, $before_hash);1140 my $linkfilename = &FileUtils::filenameConcatenate($base_dir, $before_hash); 1139 1141 1140 1142 my $rl = 0; … … 1158 1160 my @dirs = split /[\/\\]/, $file; 1159 1161 my $domname = shift (@dirs); 1160 $before_hash = & util::filename_cat($domname, $before_hash);1162 $before_hash = &FileUtils::filenameConcatenate($domname, $before_hash); 1161 1163 $before_hash =~ s@\\@/@g; # for windows 1162 1164 } … … 1181 1183 $before_hash = "/$before_hash"; 1182 1184 1183 $before_hash = & util::filename_cat("",$before_hash);1185 $before_hash = &FileUtils::filenameConcatenate("",$before_hash); 1184 1186 $before_hash =~ s@^$base_dir/@@; 1185 1187 } … … 1188 1190 # Turn relative file path into full path 1189 1191 my $dirname = &File::Basename::dirname($file); 1190 $before_hash = & util::filename_cat($dirname, $before_hash);1192 $before_hash = &FileUtils::filenameConcatenate($dirname, $before_hash); 1191 1193 $before_hash = $self->eval_dir_dots($before_hash); 1192 1194 } 1193 1195 1194 my $linkfilename = & util::filename_cat($base_dir, $before_hash);1196 my $linkfilename = &FileUtils::filenameConcatenate($base_dir, $before_hash); 1195 1197 1196 1198 … … 1462 1464 # Need to fiddle with number of elements in @eval_dirs if the 1463 1465 # first one is the empty string. This is because of a 1464 # modification to util::filename_catthat supresses the addition1466 # modification to FileUtils::filenameConcatenate that supresses the addition 1465 1467 # of a leading '/' character (or \ if windows) (intended to help 1466 1468 # filename cat with relative paths) if the first entry in the … … 1474 1476 } 1475 1477 1476 my $evaluated_filename = (scalar @eval_dirs > 0) ? & util::filename_cat(@eval_dirs) : "";1478 my $evaluated_filename = (scalar @eval_dirs > 0) ? &FileUtils::filenameConcatenate(@eval_dirs) : ""; 1477 1479 return $evaluated_filename; 1478 1480 } … … 1756 1758 1757 1759 # softlink to collection tmp dir 1758 my $tmp_dirname = & util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "tidytmp");1760 my $tmp_dirname = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, "tidytmp"); 1759 1761 &util::mk_dir($tmp_dirname) if (!-e $tmp_dirname); 1760 1762 … … 1771 1773 { 1772 1774 my $folderdirname = $`; 1773 $tmp_dirname = & util::filename_cat($tmp_dirname,$folderdirname);1775 $tmp_dirname = &FileUtils::filenameConcatenate($tmp_dirname,$folderdirname); 1774 1776 &util::mk_dir($tmp_dirname) if (!-e $tmp_dirname); 1775 1777 $test_dirname = $'; #' … … 1777 1779 } 1778 1780 1779 my $tmp_filename = & util::filename_cat($tmp_dirname, "$tailname$suffix");1781 my $tmp_filename = &FileUtils::filenameConcatenate($tmp_dirname, "$tailname$suffix"); 1780 1782 1781 1783 # tidy or convert the input file if it is a HTML-like file or it is accepted by the process_exp … … 1786 1788 if ($self->{'old_style_HDL'}) 1787 1789 { 1788 $hdl_output_filename = & util::filename_cat($tmp_dirname, "$tailname$suffix");1790 $hdl_output_filename = &FileUtils::filenameConcatenate($tmp_dirname, "$tailname$suffix"); 1789 1791 $hdl_output_filename = $self->convert_to_newHDLformat($input_filename,$hdl_output_filename); 1790 1792 } … … 1797 1799 foreach my $file (@files) 1798 1800 { 1799 my $src_file = & util::filename_cat($base_dirname,$file);1800 my $dest_file = & util::filename_cat($tmp_dirname,$file);1801 my $src_file = &FileUtils::filenameConcatenate($base_dirname,$file); 1802 my $dest_file = &FileUtils::filenameConcatenate($tmp_dirname,$file); 1801 1803 if ((!-e $dest_file) && (!-d $src_file)) 1802 1804 { … … 1810 1812 if ($self->{'use_realistic_book'}) 1811 1813 { 1812 $tidy_output_filename = & util::filename_cat($tmp_dirname, "$tailname$suffix");1814 $tidy_output_filename = &FileUtils::filenameConcatenate($tmp_dirname, "$tailname$suffix"); 1813 1815 $tidy_output_filename = $self->tmp_tidy_file($hdl_output_filename,$tidy_output_filename); 1814 1816 } … … 1858 1860 1859 1861 # get the full path to the image 1860 my $img_file = & util::filename_cat($dirname,$attr->{src});1862 my $img_file = &FileUtils::filenameConcatenate($dirname,$attr->{src}); 1861 1863 1862 1864 # set the width and height attribute
Note:
See TracChangeset
for help on using the changeset viewer.