Bug fix/fix tutorials (#25)

* fix: Fix tutorials * fix: Fix tutorials --------- Co-authored-by: Romuald Rousseau <[email protected]>
RomualdRousseau · Oct 17, 2024 · adb5d96 · adb5d96
1 parent 069b877
commit adb5d96
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 17 deletions.
diff --git a/archery-examples/src/main/java/com/github/romualdrousseau/archery/examples/Tutorial2.java b/archery-examples/src/main/java/com/github/romualdrousseau/archery/examples/Tutorial2.java
@@ -8,7 +8,6 @@
 
 import com.github.romualdrousseau.archery.Document;
 import com.github.romualdrousseau.archery.DocumentFactory;
-import com.github.romualdrousseau.archery.parser.LayexTableParser;
 
 public class Tutorial2 implements Runnable {
 
@@ -21,33 +20,24 @@ public void run() {
         final var builder = Common.loadModelBuilderFromGitHub("sales-english");
 
         final var model = builder
-                .setTableParser(this.customTableParser())
                 .setEntityList(this.customEntities(builder.getEntityList()))
                 .setPatternMap(this.customPatternMap(builder.getPatternMap()))
                 .build();
 
         final var file = Common.loadData("document with multiple tables.xlsx", this.getClass());
         try (final var doc = DocumentFactory.createInstance(file, "UTF-8")
                 .setModel(model)
-                .setHints(EnumSet.of(Document.Hint.INTELLI_LAYOUT))
-                .setRecipe("sheet.setCapillarityThreshold(0)")) {
+                .setHints(EnumSet.of(Document.Hint.INTELLI_LAYOUT))) {
             doc.sheets().forEach(s -> Common.addSheetDebugger(s).getTable().ifPresent(t -> {
                 Common.printHeaders(t.headers());
                 Common.printRows(t.rows());
             }));
         }
     }
 
-    private LayexTableParser customTableParser() {
-        return new LayexTableParser(
-                List.of("(v.$)+"),
-                List.of("(()(S+$))(()([/^TOTAL/|v].+$)())+(/TOTAL/.+$)"));
-    }
-
     private List<String> customEntities(final List<String> entities) {
         final var result = new ArrayList<String>(entities);
-        result.add("PRODUCTNAME");
-        result.remove("PACKAGE");
+        result.add(0, "PRODUCTNAME");
         return result;
     }
 

diff --git a/archery-examples/src/main/java/com/github/romualdrousseau/archery/examples/Tutorial3.java b/archery-examples/src/main/java/com/github/romualdrousseau/archery/examples/Tutorial3.java
@@ -30,7 +30,7 @@ public void run() {
         try (final var doc = DocumentFactory.createInstance(file, "UTF-8")
                 .setModel(model)
                 .setHints(EnumSet.of(Document.Hint.INTELLI_LAYOUT))
-                .setRecipe("sheet.setCapillarityThreshold(0)")) {
+                .setRecipe("sheet.setCapillarityThreshold(1)")) {
 
             doc.sheets().forEach(s -> Common.addSheetDebugger(s).getTable().ifPresent(t -> {
                 Common.printHeaders(t.headers());
@@ -41,14 +41,13 @@ public void run() {
 
     private LayexTableParser customTableParser() {
         return new LayexTableParser(
-            List.of("(v.$)+"),
-            List.of("(()(S+$))(()([/^TOTAL/|v].+$)())+(/TOTAL/.+$)"));
+                List.of("((v)(S)$)+"),
+                List.of("((e.+$)?(v+$))(()([/^TOTAL/|v].+$)())+(/TOTAL/.+$)"));
     }
 
     private List<String> customEntities(final List<String> entities) {
         final var result = new ArrayList<String>(entities);
-        result.add("PRODUCTNAME");
-        result.remove("PACKAGE");
+        result.add(0, "PRODUCTNAME");
         return result;
     }