Mercurial > dive4elements > river
comparison flys-backend/src/main/java/de/intevation/flys/importer/ImportWst.java @ 2347:0acf28a3d28a
Removed the Unit from Wsts - added a WstUnit column to rivers.
flys-backend/trunk@2884 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Tue, 04 Oct 2011 15:28:19 +0000 |
parents | f834b411ca57 |
children | 3eb520b7a70e |
comparison
equal
deleted
inserted
replaced
2346:f834b411ca57 | 2347:0acf28a3d28a |
---|---|
65 | 65 |
66 public ImportWstColumn getColumn(int index) { | 66 public ImportWstColumn getColumn(int index) { |
67 return columns.get(index); | 67 return columns.get(index); |
68 } | 68 } |
69 | 69 |
70 public ImportUnit getUnit() { | |
71 return unit; | |
72 } | |
73 | |
70 public void setUnit(ImportUnit unit) { | 74 public void setUnit(ImportUnit unit) { |
71 this.unit = unit; | 75 this.unit = unit; |
72 } | 76 } |
73 | 77 |
74 public void storeDependencies(River river) { | 78 public void storeDependencies(River river) { |
78 | 82 |
79 for (ImportWstColumn column: columns) { | 83 for (ImportWstColumn column: columns) { |
80 column.storeDependencies(river); | 84 column.storeDependencies(river); |
81 } | 85 } |
82 | 86 |
83 unit.storeDependencies(river); | |
84 | |
85 Session session = ImporterSession.getInstance().getDatabaseSession(); | 87 Session session = ImporterSession.getInstance().getDatabaseSession(); |
86 session.flush(); | 88 session.flush(); |
87 } | 89 } |
88 | 90 |
89 public Wst getPeer(River river) { | 91 public Wst getPeer(River river) { |
90 if (peer == null) { | 92 if (peer == null) { |
91 Unit u = unit.getPeer(river); | |
92 Session session = ImporterSession.getInstance().getDatabaseSession(); | 93 Session session = ImporterSession.getInstance().getDatabaseSession(); |
93 Query query = session.createQuery( | 94 Query query = session.createQuery( |
94 "from Wst where " + | 95 "from Wst where " + |
95 "river=:river and description=:description and kind=:kind"); | 96 "river=:river and description=:description and kind=:kind"); |
96 query.setParameter("river", river); | 97 query.setParameter("river", river); |
97 query.setParameter("description", description); | 98 query.setParameter("description", description); |
98 query.setParameter("kind", kind); | 99 query.setParameter("kind", kind); |
99 List<Wst> wsts = query.list(); | 100 List<Wst> wsts = query.list(); |
100 if (wsts.isEmpty()) { | 101 if (wsts.isEmpty()) { |
101 peer = new Wst(river, description, kind, u); | 102 peer = new Wst(river, description, kind); |
102 session.save(peer); | 103 session.save(peer); |
103 } | 104 } |
104 else { | 105 else { |
105 peer = wsts.get(0); | 106 peer = wsts.get(0); |
106 } | 107 } |