Mercurial > dive4elements > river
diff backend/src/main/java/org/dive4elements/river/importer/ImportWstColumn.java @ 6504:7664ab97b4c7
Backend: Store source of a wst column if available.
author | Sascha L. Teichmann <teichmann@intevation.de> |
---|---|
date | Fri, 28 Jun 2013 17:00:55 +0200 |
parents | 4c3ccf2b0304 |
children | 1c68d4b2a1c0 |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportWstColumn.java Fri Jun 28 14:11:58 2013 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportWstColumn.java Fri Jun 28 17:00:55 2013 +0200 @@ -33,6 +33,7 @@ protected String name; protected String description; protected Integer position; + protected String source; protected ImportTimeInterval timeInterval; @@ -50,7 +51,8 @@ ImportWst wst, String name, String description, - Integer position + Integer position, + String source ) { this(); this.wst = wst; @@ -59,6 +61,15 @@ this.position = position; } + public ImportWstColumn( + ImportWst wst, + String name, + String description, + Integer position + ) { + this(wst, name, description, position, null); + } + public ImportWst getWst() { return wst; } @@ -91,6 +102,14 @@ this.position = position; } + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + public void addColumnValue(BigDecimal position, BigDecimal w) { columnValues.add( new ImportWstColumnValue(this, position, w)); @@ -135,12 +154,14 @@ Wst w = wst.getPeer(river); Session session = ImporterSession.getInstance().getDatabaseSession(); Query query = session.createQuery( - "from WstColumn where " + - "wst=:wst and name=:name " + + "from WstColumn where" + + " wst=:wst and name=:name" + + " and source=:source" + " and position=:position"); - query.setParameter("wst", w); - query.setParameter("name", name); - query.setParameter("position", position); + query.setParameter("wst", w); + query.setParameter("name", name); + query.setParameter("position", position); + query.setParameter("source", source); TimeInterval ti = timeInterval != null ? timeInterval.getPeer() @@ -148,7 +169,8 @@ List<WstColumn> columns = query.list(); if (columns.isEmpty()) { - peer = new WstColumn(w, name, description, position, ti); + peer = new WstColumn( + w, name, description, source, position, ti); session.save(peer); } else {