Re-merge latest fixes

kermitt2 · Jul 21, 2016 · 0465123 · 0465123
1 parent d21e54c
commit 0465123
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/grobid-core/src/main/java/org/grobid/core/engines/HeaderParser.java b/grobid-core/src/main/java/org/grobid/core/engines/HeaderParser.java
@@ -81,8 +81,7 @@ public Pair<String, Document> processing2(String pdfInput, boolean consolidate,
                                               BiblioItem resHeader, GrobidAnalysisConfig config) {
         DocumentSource documentSource = null;
         try {
-            documentSource = DocumentSource.fromPdf(new File(pdfInput), config.getStartPage(), config.getEndPage(),
-                    config.getPdfAssetPath() != null);
+            documentSource = DocumentSource.fromPdf(new File(pdfInput), config.getStartPage(), config.getEndPage());
             Document doc = new Document(documentSource);
             doc.addTokenizedDocument(config);
 

diff --git a/grobid-core/src/main/java/org/grobid/core/engines/Segmentation.java b/grobid-core/src/main/java/org/grobid/core/engines/Segmentation.java
@@ -88,7 +88,7 @@ public Segmentation() {
         super(GrobidModels.SEGMENTATION);
     }
 
-    public Document processing(File input, GrobidAnalysisConfig config) {
+    /*public Document processing(File input, GrobidAnalysisConfig config) {
         if (input == null) {
             throw new GrobidResourceException("Cannot process pdf file, because input file was null.");
         }
@@ -100,7 +100,8 @@ public Document processing(File input, GrobidAnalysisConfig config) {
                 config.getPdfAssetPath() != null);
 
         return processing(documentSource, config);
-    }
+    }*/
+
     /**
      * Segment a PDF document into high level zones: cover page, document header,
      * page footer, page header, body, page numbers, biblio section and annexes.

diff --git a/grobid-service/src/main/doc/grobid-service-manual.odt b/grobid-service/src/main/doc/grobid-service-manual.odt
diff --git a/grobid-service/src/main/doc/grobid-service-manual.pdf b/grobid-service/src/main/doc/grobid-service-manual.pdf