Changeset 29238

Timestamp:

2014-08-26T15:58:38+12:00 (10 years ago)

Author:

ak19

Message:

Correcting detection of pdfbox extension for GS3. For GS3, it's not supposed to be in GS3/ext but in gs2build/ext. For GS2 it's also in GS2/ext.

File:

• main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -505 +505 @@
                 DebugStream.println("Not checking for PDFBox.");
             }
-            else {
-                String gs_dir = GS3 ? gsdl3_src_path : gsdl_path;
+            else {              
+                String gs_dir = gsdl_path; // for GS3, pdf-box is in gs2build/ext (not in GS3/ext), for GS2 it's also in GS2/ext
                 File pdfboxExtensionFolder = new File(gs_dir+File.separator+"ext"+File.separator+"pdf-box");
                 if (!(pdfboxExtensionFolder.exists() && pdfboxExtensionFolder.isDirectory())) {