Changeset 28489
- Timestamp:
- 2013-10-17T17:03:50+13:00 (11 years ago)
- Location:
- main/trunk/greenstone2/perllib/plugins
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm
r27578 r28489 259 259 260 260 $filename_full_path = &util::upgrade_if_dos_filename($filename_full_path); 261 ### print STDERR "*** DirectoryPlugin::file_is_blocked $filename_full_path\n"; 262 263 if ($ENV{'GSDLOS'} =~ m/^windows$/) { 261 262 if (($ENV{'GSDLOS'} =~ m/^windows$/) && ($^O ne "cygwin")) { 264 263 # on windows, all block paths are lowercased. 265 264 my $lower_filename = lc ($filename_full_path); … … 553 552 #print STDERR "processing $raw_full_filename\n"; 554 553 # Follow Windows shortcuts 555 if ($raw_subfile =~ /(?i)\.lnk$/ && $ENV{'GSDLOS'} =~ /^windows$/i) {554 if ($raw_subfile =~ m/(?i)\.lnk$/ && (($ENV{'GSDLOS'} =~ m/^windows$/i) && ($^O ne "cygwin"))) { 556 555 require Win32::Shortcut; 557 556 my $shortcut = new Win32::Shortcut(&FileUtils::filenameConcatenate($dirname, $raw_subfile)); -
main/trunk/greenstone2/perllib/plugins/MetadataXMLPlugin.pm
r27306 r28489 220 220 return undef unless $self->can_process_this_file($filename_full_path); 221 221 222 if ($ENV{'GSDLOS'} =~ m/^windows$/) {223 224 225 226 227 228 229 230 231 232 233 234 235 222 if (($ENV{'GSDLOS'} =~ m/^windows$/) && ($^O ne "cygwin")) { 223 224 my $lower_drive = $filename_full_path; 225 $lower_drive =~ s/^([A-Z]):/\l$1:/i; 226 227 my $upper_drive = $filename_full_path; 228 $upper_drive =~ s/^([A-Z]):/\u$1:/i; 229 230 $block_hash->{'metadata_files'}->{$lower_drive} = 1; 231 $block_hash->{'metadata_files'}->{$upper_drive} = 1; 232 } 233 else { 234 $block_hash->{'metadata_files'}->{$filename_full_path} = 1; 235 } 236 236 237 237 return 1;
Note:
See TracChangeset
for help on using the changeset viewer.