fix mess from merge

kermitt2 · Jan 6, 2025 · 164636b · 164636b
1 parent a45e2bf
commit 164636b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/grobid-core/src/main/java/org/grobid/core/GrobidModels.java b/grobid-core/src/main/java/org/grobid/core/GrobidModels.java
@@ -107,7 +107,7 @@ public static Flavor fromLabel(String text) {
         public String toString() {
             return getLabel();
         }
-    }
+
         public static List<String> getLabels() {
             return Arrays.stream(Flavor.values())
                 .map(Flavor::getLabel)

diff --git a/grobid-core/src/main/java/org/grobid/core/engines/FullTextParser.java b/grobid-core/src/main/java/org/grobid/core/engines/FullTextParser.java
@@ -87,7 +87,7 @@ public FullTextParser(EngineParsers parsers) {
         this(parsers, null);
     }
 
-    public FullTextParser(EngineParsers parsers, Flavor flavor) {
+    public FullTextParser(EngineParsers parsers, GrobidModels.Flavor flavor) {
         super(GrobidModels.getModelFlavor(FULLTEXT, flavor));
         this.parsers = parsers;
         tmpPath = GrobidProperties.getTempPath();
@@ -308,11 +308,11 @@ else if (config.getConsolidateCitations() == 2)
                     resultHeaderAsArray[0] = resultHeaderAsArray[0].replace(PARAGRAPH_LABEL, "I-" + PARAGRAPH_LABEL);
                     resultHeader = String.join("\n", resultHeaderAsArray);
 
-                    resultBody = StringUtils.strip(resultHeader + "\n" + resultBody);
+                    bodyResults = StringUtils.strip(resultHeader + "\n" + bodyResults);
                     List<LayoutToken> concatenatedTokenization = Stream
-                        .concat(tokensHeader.stream(), layoutTokenization.getTokenization().stream())
+                        .concat(tokensHeader.stream(), bodyLayoutTokens.getTokenization().stream())
                         .collect(Collectors.toList());
-                    layoutTokenization.setTokenization(concatenatedTokenization);
+                    bodyLayoutTokens.setTokenization(concatenatedTokenization);
                 }
 
                 // we apply now the figure and table models based on the fulltext labeled output
@@ -1267,7 +1267,7 @@ public Document createTraining(File inputFile,
                                    String pathFullText,
                                    String pathTEI,
                                    int id,
-                                   Flavor flavor) {
+                                   GrobidModels.Flavor flavor) {
         if (tmpPath == null)
             throw new GrobidResourceException("Cannot process pdf file, because temp path is null.");
         if (!tmpPath.exists()) {