Mercurial > dive4elements > river
comparison backend/src/main/java/org/dive4elements/river/importer/ImportWstColumn.java @ 5889:65ebae00fb76
WST-import: do not match against description (mostly NULL)
| author | Tom Gottfried <tom.gottfried@intevation.de> |
|---|---|
| date | Thu, 02 May 2013 18:06:04 +0200 |
| parents | 4dd33b86dc61 |
| children | 4c3ccf2b0304 |
comparison
equal
deleted
inserted
replaced
| 5888:a763fb7aa2e5 | 5889:65ebae00fb76 |
|---|---|
| 134 if (peer == null) { | 134 if (peer == null) { |
| 135 Wst w = wst.getPeer(river); | 135 Wst w = wst.getPeer(river); |
| 136 Session session = ImporterSession.getInstance().getDatabaseSession(); | 136 Session session = ImporterSession.getInstance().getDatabaseSession(); |
| 137 Query query = session.createQuery( | 137 Query query = session.createQuery( |
| 138 "from WstColumn where " + | 138 "from WstColumn where " + |
| 139 "wst=:wst and name=:name and description=:description" + | 139 "wst=:wst and name=:name " + |
| 140 " and position=:position"); | 140 " and position=:position"); |
| 141 query.setParameter("wst", w); | 141 query.setParameter("wst", w); |
| 142 query.setParameter("name", name); | 142 query.setParameter("name", name); |
| 143 query.setParameter("description", description); | |
| 144 query.setParameter("position", position); | 143 query.setParameter("position", position); |
| 145 | 144 |
| 146 TimeInterval ti = timeInterval != null | 145 TimeInterval ti = timeInterval != null |
| 147 ? timeInterval.getPeer() | 146 ? timeInterval.getPeer() |
| 148 : null; | 147 : null; |