Changeset 32207 for main/trunk/greenstone2

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

Location:

main/trunk/greenstone2

Files:

• bin/script/gsConvert.pl (modified) (2 diffs)
• setup.bat (modified) (1 diff)

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

main/trunk/greenstone2/setup.bat

@@ -245 +245 @@
 
 :done
+
+:: Want to know bitness of machine for working out whether to use xpdftools' bin32 or
+::   bin64 directory to run Xpdf's pdftohtml.
+:: Googled: determine bit architecture windows command line
+::   techgenix.com/aquicktiptocheckoperatingsystemarchitecture/
+::   'Type "SET Processor" (without double quotes)
+::   You will see the output SIMILAR to below [among OTHER lines of output]:
+::   PROCESSOR_ARCHITECTURE=x86
+::   OR
+::   PROCESSOR_ARCHITECTURE=x64.'
+::   (In my case PROCESSOR_ARCHITECTURE=AMD64)
+:: The following runs the cmd "set Processor". Then, among the multiline output, it finds the line
+::   containing "PROCESSOR_ARCHITECTURE", splits this line on the delimiter "=" and stores the 2nd token in %%G
+::   Based on the example "_ping_cmd" at https://ss64.com/nt/for_cmd.html
+for /f "tokens=2 delims==" %%G in ('set Processor ^|find "PROCESSOR_ARCHITECTURE"') do set BITNESS=%%G
+rem echo Processor architecture is %BITNESS%
+::   which will be something like "amd64" or "x64", or "x86" for 32 bit
+:: From https://ss64.com/nt/syntax-substring.html
+::   "To do a string comparison, remove the SearchString and compare the result with the original
+::   variable before removal. If both strings are the same, then SearchString was not found:"
+rem set example=amd64
+rem IF /i "%example:64=%" == "%example%" (echo Not 64 bit) ELSE (echo 64 bit)
+if /i "%BITNESS:64=%" == "%BITNESS%" (set BITNESS=32) else (set BITNESS=64)
+echo Bitness of machine: %BITNESS%
+
+
 popd
-endlocal & set PATH=%PATH%& set GSDLHOME=%GSDLHOME%& set GSDLOS=%GSDLOS%& set JRE_HOME=%JRE_HOME%& set JAVA_HOME=%JAVA_HOME%
+endlocal & set PATH=%PATH%& set GSDLHOME=%GSDLHOME%& set GSDLOS=%GSDLOS%& set JRE_HOME=%JRE_HOME%& set JAVA_HOME=%JAVA_HOME%& set BITNESS=%BITNESS%
 
 if not "%JAVA_HOME%" == "" echo JAVA_HOME: %JAVA_HOME%