Changeset 37736

Timestamp:

2023-05-04T22:46:17+12:00 (4 weeks ago)

Author:

davidb

Message:

When testing incremental addition with a manifest file on Linux, it was found that the 'lc()' RE caused issues with working out which files have previously been seen or not. The test collection happened to use .JPG for its images. The resulted in all the images being reprocessed again, as they did not match what was stored in the archive's DB file. Based on the comment that was already there that detailed wy the lc() was being used (to do with testing on Windows with diffcol), it was decided to let the lc() remain if on Windows but to not do this when on non-Windows systems (Linux, MacOS) as these file systems definitely are case-sensitive (whereas Windows is typically case sensitive these days, but not always, especially if we are changing filenames back to DOS shortened versions, as is done in part of the Greenstone Perl code)

File:

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

main/trunk/greenstone2/perllib/util.pm

@@ -1734 +1734 @@
         $path =~ s/^$re_path/$placeholder/; #case sensitive or not?
         #$path =~ s/^[\\\/]//; # remove gs_path's trailing separator left behind at the start of the path
-        # lowercase file extension, This is needed when shortfilenames are used, as case affects alphetical ordering, which affects diffcol     
-        $path =~ s/\.([A-Z]+)$/".".lc($1)/e;
+
+        if (($ENV{'GSDLOS'} =~ m/^windows$/i) && ($^O ne "cygwin")) {       
+        # lowercase file extension, This is needed when shortfilenames are used, as case affects alphetical ordering, which affects diffcol
+
+        # Note: the following used be done on all Operating Systems, even though the reason for it seems to be related to Windows
+        #   (which, when in its most basic form, is case-insenstive for its filesystem)
+        #   However, making the file-extension be lower-case cases incremental importing to break on Unix systems
+        
+        $path =~ s/\.([A-Z]+)$/".".lc($1)/e;
+        }
+        
         last; # done
     }