Use batch files to resolve conflict between pdf2xml & pdfalto dlls.

kermitt2 · Apr 26, 2019 · fe8c8b8 · fe8c8b8
1 parent 2285253
commit fe8c8b8
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 2 deletions.
diff --git a/grobid-core/src/main/java/org/grobid/core/document/DocumentSource.java b/grobid-core/src/main/java/org/grobid/core/document/DocumentSource.java
@@ -74,8 +74,14 @@ public static DocumentSource fromPdf(File pdfFile, int startPage, int endPage,
     private String getPdfToXmlCommand(boolean withImage, boolean withAnnotations, boolean withOutline) {
         StringBuilder pdfToXml = new StringBuilder();
         pdfToXml.append(GrobidProperties.getPdfToXMLPath().getAbsolutePath());
-        pdfToXml.append(
-            GrobidProperties.isContextExecutionServer() ? File.separator + "pdfalto_server" : File.separator + "pdfalto");
+        // bat files sets the path env variable for cygwin dll
+        if (SystemUtils.IS_OS_WINDOWS) {
+            pdfToXml.append(
+                GrobidProperties.isContextExecutionServer() ? File.separator + "pdfalto_server.bat" : File.separator + "pdfalto.bat");
+        } else
+            pdfToXml.append(
+                GrobidProperties.isContextExecutionServer() ? File.separator + "pdfalto_server" : File.separator + "pdfalto");
+
         pdfToXml.append(" -blocks -noImageInline -fullFontName ");
 
         if (!withImage) {

diff --git a/grobid-home/pdf2xml/win-32/pdfalto.bat b/grobid-home/pdf2xml/win-32/pdfalto.bat
@@ -0,0 +1,2 @@
+SET PATH=%PATH%;%~dp0pdfalto_dlls
+%~dp0pdfalto.exe %*
diff --git a/grobid-home/pdf2xml/win-32/pdfalto_dlls/cygwin1.dll b/grobid-home/pdf2xml/win-32/pdfalto_dlls/cygwin1.dll
diff --git a/grobid-home/pdf2xml/win-32/pdfalto_server.bat b/grobid-home/pdf2xml/win-32/pdfalto_server.bat
@@ -0,0 +1,2 @@
+SET PATH=%PATH%;%~dp0pdfalto_dlls
+%~dp0pdfalto_server.exe %*
diff --git a/grobid-home/pdf2xml/win-64/pdfalto.bat b/grobid-home/pdf2xml/win-64/pdfalto.bat
@@ -0,0 +1,2 @@
+SET PATH=%PATH%;%~dp0pdfalto_dlls
+%~dp0pdfalto.exe %*
diff --git a/grobid-home/pdf2xml/win-64/pdfalto_dlls/cygwin1.dll b/grobid-home/pdf2xml/win-64/pdfalto_dlls/cygwin1.dll
diff --git a/grobid-home/pdf2xml/win-64/pdfalto_server.bat b/grobid-home/pdf2xml/win-64/pdfalto_server.bat
@@ -0,0 +1,2 @@
+SET PATH=%PATH%;%~dp0pdfalto_dlls
+%~dp0pdfalto_server.exe %*