Changeset 32207 for main/trunk/greenstone2/bin/script/gsConvert.pl

Timestamp:

2018-06-25T16:51:57+12:00 (6 years ago)

Author:

ak19

Message:

Got a basic Windows version of PDFPlugin's new paged_html mode working

File:

• main/trunk/greenstone2/bin/script/gsConvert.pl (modified) (2 diffs)

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

@@ -848 +848 @@
     my $xpdf_pdftohtml = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}, "xpdf-tools");
 
-    if ($ENV{'GSDLOS'} =~ m/^windows$/i) {
+    if ($ENV{'GSDLOS'} =~ m/^darwin$/i) {
     # TODO
-    } elsif ($ENV{'GSDLOS'} =~ m/^darwin$/i) {
-    # TODO
-    } else { # unix, use the appropriate bin folder for the bitness of the system
-
+    } 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.
+    
     # Don't use $ENV{'GSDLARCH'}, use the new $ENV{'BITNESS'}, since
     # $ENV{'GSDLARCH'} is only (meant to be) set when many other 32-bit or 64-bit
@@ -866 +867 @@
     }
 
+    #print STDERR "@@@@ BITNESS: " . $ENV{'BITNESS'} . "\n";
+    
     # We'll create the file by name $output_filestem during post-conversion processing.
     # Note that Xpdf tools will only create its conversion products in a dir that does