Changeset 28489 for main/trunk/greenstone2/perllib/plugins/MetadataXMLPlugin.pm

Timestamp:

2013-10-17T17:03:50+13:00 (11 years ago)

Author:

davidb

Message:

Support for Cygwin added

File:

• main/trunk/greenstone2/perllib/plugins/MetadataXMLPlugin.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/plugins/MetadataXMLPlugin.pm

@@ -220 +220 @@
     return undef unless $self->can_process_this_file($filename_full_path);    
 
-    if ($ENV{'GSDLOS'} =~ m/^windows$/) {
-        
-        my $lower_drive = $filename_full_path;
-        $lower_drive =~ s/^([A-Z]):/\l$1:/i;
-        
-        my $upper_drive = $filename_full_path;
-        $upper_drive =~ s/^([A-Z]):/\u$1:/i;
-        
-        $block_hash->{'metadata_files'}->{$lower_drive} = 1;
-        $block_hash->{'metadata_files'}->{$upper_drive} = 1;        
-    }
-    else {
-        $block_hash->{'metadata_files'}->{$filename_full_path} = 1;
-    }
+    if (($ENV{'GSDLOS'} =~ m/^windows$/) && ($^O ne "cygwin")) {
+    
+    my $lower_drive = $filename_full_path;
+    $lower_drive =~ s/^([A-Z]):/\l$1:/i;
+    
+    my $upper_drive = $filename_full_path;
+    $upper_drive =~ s/^([A-Z]):/\u$1:/i;
+    
+    $block_hash->{'metadata_files'}->{$lower_drive} = 1;
+    $block_hash->{'metadata_files'}->{$upper_drive} = 1;        
+    }
+    else {
+    $block_hash->{'metadata_files'}->{$filename_full_path} = 1;
+    }
 
     return 1;