From 4e1bb2414006592d43bb22818925edd49a5a55dc Mon Sep 17 00:00:00 2001 From: Aazhar Date: Fri, 26 Apr 2019 23:01:23 +0200 Subject: [PATCH] Add subdirectory for pdfalto executables and dlls. --- .../org/grobid/core/document/DocumentSource.java | 8 ++++---- .../win-32/{pdfalto_dlls => pdfalto}/cygwin1.dll | Bin .../pdf2xml/win-32/{ => pdfalto}/pdfalto.bat | 0 .../pdf2xml/win-32/{ => pdfalto}/pdfalto.exe | Bin .../pdf2xml/win-32/{ => pdfalto}/pdfalto_server.bat | 0 .../pdf2xml/win-32/{ => pdfalto}/pdfalto_server.exe | Bin .../win-64/{pdfalto_dlls => pdfalto}/cygwin1.dll | Bin .../pdf2xml/win-64/{ => pdfalto}/pdfalto.bat | 0 .../pdf2xml/win-64/{ => pdfalto}/pdfalto.exe | Bin .../pdf2xml/win-64/{ => pdfalto}/pdfalto_server.bat | 0 .../pdf2xml/win-64/{ => pdfalto}/pdfalto_server.exe | Bin 11 files changed, 4 insertions(+), 4 deletions(-) rename grobid-home/pdf2xml/win-32/{pdfalto_dlls => pdfalto}/cygwin1.dll (100%) rename grobid-home/pdf2xml/win-32/{ => pdfalto}/pdfalto.bat (100%) rename grobid-home/pdf2xml/win-32/{ => pdfalto}/pdfalto.exe (100%) rename grobid-home/pdf2xml/win-32/{ => pdfalto}/pdfalto_server.bat (100%) rename grobid-home/pdf2xml/win-32/{ => pdfalto}/pdfalto_server.exe (100%) rename grobid-home/pdf2xml/win-64/{pdfalto_dlls => pdfalto}/cygwin1.dll (100%) rename grobid-home/pdf2xml/win-64/{ => pdfalto}/pdfalto.bat (100%) rename grobid-home/pdf2xml/win-64/{ => pdfalto}/pdfalto.exe (100%) rename grobid-home/pdf2xml/win-64/{ => pdfalto}/pdfalto_server.bat (100%) rename grobid-home/pdf2xml/win-64/{ => pdfalto}/pdfalto_server.exe (100%) 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 index f20a17942e..eab6dd4fe0 100644 --- a/grobid-core/src/main/java/org/grobid/core/document/DocumentSource.java +++ b/grobid-core/src/main/java/org/grobid/core/document/DocumentSource.java @@ -76,10 +76,10 @@ private String getPdfToXmlCommand(boolean withImage, boolean withAnnotations, bo pdfToXml.append(GrobidProperties.getPdfToXMLPath().getAbsolutePath()); // 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( + //pdfalto executable are separated to avoid dll conflicts + pdfToXml.append(File.separator +"pdfalto"); + } + pdfToXml.append( GrobidProperties.isContextExecutionServer() ? File.separator + "pdfalto_server" : File.separator + "pdfalto"); pdfToXml.append(" -blocks -noImageInline -fullFontName "); diff --git a/grobid-home/pdf2xml/win-32/pdfalto_dlls/cygwin1.dll b/grobid-home/pdf2xml/win-32/pdfalto/cygwin1.dll similarity index 100% rename from grobid-home/pdf2xml/win-32/pdfalto_dlls/cygwin1.dll rename to grobid-home/pdf2xml/win-32/pdfalto/cygwin1.dll diff --git a/grobid-home/pdf2xml/win-32/pdfalto.bat b/grobid-home/pdf2xml/win-32/pdfalto/pdfalto.bat similarity index 100% rename from grobid-home/pdf2xml/win-32/pdfalto.bat rename to grobid-home/pdf2xml/win-32/pdfalto/pdfalto.bat diff --git a/grobid-home/pdf2xml/win-32/pdfalto.exe b/grobid-home/pdf2xml/win-32/pdfalto/pdfalto.exe similarity index 100% rename from grobid-home/pdf2xml/win-32/pdfalto.exe rename to grobid-home/pdf2xml/win-32/pdfalto/pdfalto.exe diff --git a/grobid-home/pdf2xml/win-32/pdfalto_server.bat b/grobid-home/pdf2xml/win-32/pdfalto/pdfalto_server.bat similarity index 100% rename from grobid-home/pdf2xml/win-32/pdfalto_server.bat rename to grobid-home/pdf2xml/win-32/pdfalto/pdfalto_server.bat diff --git a/grobid-home/pdf2xml/win-32/pdfalto_server.exe b/grobid-home/pdf2xml/win-32/pdfalto/pdfalto_server.exe similarity index 100% rename from grobid-home/pdf2xml/win-32/pdfalto_server.exe rename to grobid-home/pdf2xml/win-32/pdfalto/pdfalto_server.exe diff --git a/grobid-home/pdf2xml/win-64/pdfalto_dlls/cygwin1.dll b/grobid-home/pdf2xml/win-64/pdfalto/cygwin1.dll similarity index 100% rename from grobid-home/pdf2xml/win-64/pdfalto_dlls/cygwin1.dll rename to grobid-home/pdf2xml/win-64/pdfalto/cygwin1.dll diff --git a/grobid-home/pdf2xml/win-64/pdfalto.bat b/grobid-home/pdf2xml/win-64/pdfalto/pdfalto.bat similarity index 100% rename from grobid-home/pdf2xml/win-64/pdfalto.bat rename to grobid-home/pdf2xml/win-64/pdfalto/pdfalto.bat diff --git a/grobid-home/pdf2xml/win-64/pdfalto.exe b/grobid-home/pdf2xml/win-64/pdfalto/pdfalto.exe similarity index 100% rename from grobid-home/pdf2xml/win-64/pdfalto.exe rename to grobid-home/pdf2xml/win-64/pdfalto/pdfalto.exe diff --git a/grobid-home/pdf2xml/win-64/pdfalto_server.bat b/grobid-home/pdf2xml/win-64/pdfalto/pdfalto_server.bat similarity index 100% rename from grobid-home/pdf2xml/win-64/pdfalto_server.bat rename to grobid-home/pdf2xml/win-64/pdfalto/pdfalto_server.bat diff --git a/grobid-home/pdf2xml/win-64/pdfalto_server.exe b/grobid-home/pdf2xml/win-64/pdfalto/pdfalto_server.exe similarity index 100% rename from grobid-home/pdf2xml/win-64/pdfalto_server.exe rename to grobid-home/pdf2xml/win-64/pdfalto/pdfalto_server.exe