Changeset 39012

Timestamp:

2024-05-09T21:00:52+12:00 (5 weeks ago)

Author:

anupama

Message:

Committing some changes to code committed on linux after gs3 diffcol finally worked on windows that broke diffcol on windows for the Enhanced-PDF tutorial.

Location:

main/trunk/greenstone2/perllib

Files:

• convertutil.pm (modified) (1 diff)
• plugins/BaseMediaConverter.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/convertutil.pm

@@ -235 +235 @@
     # for portability between Greenstone installation, substitute gsdl environment variable in $command
     my $gsdl3srchome = $ENV{'GSDL3SRCHOME'};
+    if (($ENV{'GSDLOS'} =~ m/^windows$/i) && ($^O ne "cygwin")) {
+        $gsdl3srchome =~ s@\\@\/@g;
+    }
     my $gsdl_substitute_command = $command;
     $gsdl_substitute_command =~ s@$gsdl3srchome@\$GSDL3SRCHOME@g;

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

@@ -98 +98 @@
     }
 
+    # If on windows: converting file path parameters/local vars into unix style slashes. (It's easier than
+    # turning every windows backslash into double backslash for regex, which created more problems.)
+    if (($ENV{'GSDLOS'} =~ m/^windows$/i) && ($^O ne "cygwin")) {
+        $cached_dir =~ s@\\@\/@g;
+        $base_dir =~ s@\\@\/@g;
+        $collect_dir =~ s@\\@\/@g;
+        $ENV{'GSDLHOME'} =~ s@\\@\/@g;
+    }
+
     # populate hashmap with regex matcher to regex replacement search
     # https://stackoverflow.com/questions/41334509/can-i-use-qq-or-q-instead-of-qw-in-the-following-perl-script
     # https://perldoc.perl.org/perlop#Regexp-Quote-Like-Operators
-    $prefixre_to_replacere_map{qr/^$base_dir(.*?)$/} = "";    
+    $prefixre_to_replacere_map{qr/^$base_dir(.*?)$/} = "" if ($base_dir !~ m@\s*@);
     $prefixre_to_replacere_map{qr/^$cached_dir(.*?)$/} = qr/[\/\\][^\/\\]+([\/\\][^\/\\]*)$/;
     $prefixre_to_replacere_map{qr/^$collect_dir\/(tmp\/.*?)$/} = "";