Changeset 32220 for main

Timestamp:

2018-06-26T15:56:18+12:00 (6 years ago)

Author:

ak19

Message:

Minor changes to get xpdf-tools' pdftohtml to work for mac too.

File:

• main/trunk/greenstone2/bin/script/gsConvert.pl (modified) (1 diff)

main/trunk/greenstone2/bin/script/gsConvert.pl

@@ -850 +850 @@
     if($ENV{'GSDLOS'} =~ m/^windows$/i) { # For Windows, just use the 32 bit xpdf's pdftohtml as it works the same as the 64 bit
         $xpdf_pdftohtml = &FileUtils::filenameConcatenate($xpdf_pdftohtml, "bin32");
-    } elsif ($ENV{'GSDLOS'} =~ m/^darwin$/i) {
+    #} elsif ($ENV{'GSDLOS'} =~ m/^darwin$/i) {
         # TODO
-    } else { # unix or windows, use the appropriate bin folder for the bitness of the system
-        # In fact, when testing 3 different PDF docs, it doesn't seem to make a difference on
-        # 64 bit Windows whether the pdftohtml binary in the bin32 or bin64 folder is used.
-        # However, maybe we'll use another xpdf-tool too in future where bitness will be relevant.
+    } else { # unix (linux|darwin), use the bin32/bin64 folder depending on the BITNESS env var
     
         # Don't use $ENV{'GSDLARCH'}, use the new $ENV{'BITNESS'}, since