Mercurial > dive4elements > river
diff backend/src/main/java/org/dive4elements/river/importer/common/AbstractSeriesImport.java @ 9650:a2a42a6bac6b
Importer (s/u-info) extensions:
outer try/catch for parse and log of line no,
catching parsing exception if not enough value fields,
parsing error and warning log messages with line number,
detecting and rejecting duplicate data series,
better differentiation between error and warning log messages
| author | mschaefer |
|---|---|
| date | Mon, 23 Mar 2020 14:57:03 +0100 |
| parents | 4c5eeaff554c |
| children |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/common/AbstractSeriesImport.java Wed Dec 04 16:59:25 2019 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/common/AbstractSeriesImport.java Mon Mar 23 14:57:03 2020 +0100 @@ -99,8 +99,9 @@ return this.values.size(); } - public void addValue(final KMLINE value) { + public boolean addValue(final KMLINE value) { this.values.add(value); + return true; } public int getValueStoreCount(final StoreMode mode) { @@ -144,7 +145,7 @@ if (this.peer != null) return this.peer; final Session session = ImporterSession.getInstance().getDatabaseSession(); - final List<SERIES> rows = querySeriesItem(session, river); + final List<SERIES> rows = querySeriesItem(session, river, false); if (rows.isEmpty()) { getLog().info("Create new database instance"); this.peer = createSeriesItem(river); @@ -158,9 +159,10 @@ } /** - * Queries the series item(s) from the database + * Queries the series item(s) from the database<br> + * if specified and necessary, the parent is also queried by properties instead of using its getPeer method */ - public abstract List<SERIES> querySeriesItem(final Session session, final River river); + public abstract List<SERIES> querySeriesItem(final Session session, final River river, final boolean doQueryParent); /** * Creates a new value item