diff --git a/README.md b/README.md index d765cda..7e6b0b4 100644 --- a/README.md +++ b/README.md @@ -5,4 +5,4 @@ This project contains different PDF parsers for my personal use. Feel free to co ### Caruna Invoice Parser PDF parser to parse Caruna invoices. -Usage: ``./gradlew :caruna-invoice:run /path/to/pdf`` \ No newline at end of file +Usage: ``./gradlew :caruna-invoice:run --args="/path/to/pdf"`` \ No newline at end of file diff --git a/caruna-invoice/build/classes/java/main/com/devsoap/parsers/caruna/Parser.class b/caruna-invoice/build/classes/java/main/com/devsoap/parsers/caruna/Parser.class index 0e82e28..ab92d8d 100644 Binary files a/caruna-invoice/build/classes/java/main/com/devsoap/parsers/caruna/Parser.class and b/caruna-invoice/build/classes/java/main/com/devsoap/parsers/caruna/Parser.class differ diff --git a/caruna-invoice/src/main/java/com/devsoap/parsers/caruna/Parser.java b/caruna-invoice/src/main/java/com/devsoap/parsers/caruna/Parser.java index b7392f5..285b003 100644 --- a/caruna-invoice/src/main/java/com/devsoap/parsers/caruna/Parser.java +++ b/caruna-invoice/src/main/java/com/devsoap/parsers/caruna/Parser.java @@ -25,10 +25,10 @@ import java.util.regex.Pattern; public class Parser { private static final Pattern DATE_RANGE_PATTERN = Pattern.compile("(\\d\\d?\\.\\d\\d?\\.\\d\\d\\d\\d) - (\\d\\d?\\.\\d\\d?\\.\\d\\d\\d\\d)"); - private static final Pattern PERUSMAKSU_PATTERN = Pattern.compile("Perusmaksu.* (\\d*,\\d\\d) EUR"); - private static final Pattern P_SIIRTO_PATTERN = Pattern.compile("Päiväsiirto.* (\\d*,\\d\\d) snt.* (\\d*,\\d\\d) EUR"); - private static final Pattern O_SIIRTO_PATTERN = Pattern.compile("Yösiirto.* (\\d*,\\d\\d) snt.* (\\d*,\\d\\d) EUR"); - private static final Pattern TAX_PATTERN = Pattern.compile("Sähkövero.* (\\d*,\\d\\d) EUR"); + private static final Pattern PERUSMAKSU_PATTERN = Pattern.compile("Perusmaksu.* (\\d*,\\d\\d) (EUR|€)"); + private static final Pattern P_SIIRTO_PATTERN = Pattern.compile("Päiväsiirto.* (\\d*,\\d\\d) snt.* (\\d*,\\d\\d) (EUR|€)"); + private static final Pattern O_SIIRTO_PATTERN = Pattern.compile("Yösiirto.* (\\d*,\\d\\d) snt.* (\\d*,\\d\\d) (EUR|€)"); + private static final Pattern TAX_PATTERN = Pattern.compile("Sähkövero.* (\\d*,\\d\\d) (EUR|€)"); private static final Locale FI_LOCALE = new Locale("FI", "fi"); private static final DateTimeFormatter FI_DATE = DateTimeFormatter