Changeset 23388 for main/trunk/greenstone2
- Timestamp:
- 2010-12-06T13:15:57+13:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/util.pm
r23371 r23388 530 530 if ($ENV{'GSDLOS'} =~ m/^windows$/i) { 531 531 require Win32; 532 533 print STDERR "***** utf8 filename = $utf8_filename\n\n\n"; 534 532 535 my $unicode_filename = decode("utf8",$utf8_filename); 533 536 $real_filename = Win32::GetShortPathName($unicode_filename); … … 1096 1099 1097 1100 if ($ENV{'GSDLOS'} =~ m/^windows$/i) { 1098 require Win32;1099 1101 # Ensure any DOS-like filename, such as test~1.txt, has been upgraded 1100 1102 # to its long (Windows) version … … 1105 1107 $filename_full_path = encode("utf8",$filename_full_path); 1106 1108 } 1109 } 1110 1111 return $filename_full_path; 1112 } 1113 1114 1115 sub downgrade_if_dos_filename 1116 { 1117 my ($filename_full_path) = @_; 1118 1119 if ($ENV{'GSDLOS'} =~ m/^windows$/i) { 1120 require Win32; 1121 1122 # Ensure the given long Windows filename is in a form that can 1123 # be opened by Perl => convert it to a short DOS-like filename 1124 1125 ## print STDERR "**** asked to downgrade: $filename_full_path\n"; 1126 1127 $filename_full_path = Win32::GetShortPathName($filename_full_path); 1128 1129 ## print STDERR "**** now: $filename_full_path\n"; 1130 1131 # Make sure initial drive letter is lower-case (to fit in with rest of Greenstone) 1132 $filename_full_path =~ s/^(.)/\l$1/; 1107 1133 } 1108 1134 … … 1384 1410 ($tailname,$dirname,$suffix) = File::Basename::fileparse($filename, "\\.(?:[^\\.]+?)\$"); 1385 1411 } 1386 $suffix = "" if !$suffix; 1412 if (!$suffix) { 1413 $suffix = ""; 1414 } 1415 else { 1416 $suffix = lc($suffix); 1417 } 1387 1418 1388 1419 if ($rename_method eq "url") {
Note:
See TracChangeset
for help on using the changeset viewer.