Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java @ 1018:d42fa223be48
Datacage: added first user specific config for cross sections.
flys-artifacts/trunk@2464 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Thu, 04 Aug 2011 15:05:02 +0000 |
| parents | 9a1a3080ad98 |
| children | 930a9ce24294 |
comparison
equal
deleted
inserted
replaced
| 1017:8637756275e5 | 1018:d42fa223be48 |
|---|---|
| 70 protected static void artifactToParameters( | 70 protected static void artifactToParameters( |
| 71 FLYSArtifact artifact, | 71 FLYSArtifact artifact, |
| 72 Map<String, Object> parameters | 72 Map<String, Object> parameters |
| 73 ) { | 73 ) { |
| 74 parameters.put("current-state-id", artifact.getCurrentStateId()); | 74 parameters.put("current-state-id", artifact.getCurrentStateId()); |
| 75 parameters.put("artifact-id", artifact.identifier()); | |
| 75 | 76 |
| 76 for (StateData sd: artifact.getAllData()) { | 77 for (StateData sd: artifact.getAllData()) { |
| 77 Object value = sd.getValue(); | 78 Object value = sd.getValue(); |
| 78 if (value == null) { | 79 if (value == null) { |
| 79 continue; | 80 continue; |
| 137 { | 138 { |
| 138 List<Builder.NamedConnection> connections = | 139 List<Builder.NamedConnection> connections = |
| 139 new ArrayList<Builder.NamedConnection>(2); | 140 new ArrayList<Builder.NamedConnection>(2); |
| 140 | 141 |
| 141 if (userId != null) { // system and user templates | 142 if (userId != null) { // system and user templates |
| 142 connections.add(new Builder.NamedConnection( | |
| 143 Builder.CONNECTION_USER, systemConnection)); | |
| 144 | |
| 145 // get connection to datacage db | 143 // get connection to datacage db |
| 146 DataSource dataSource = DBConfig | 144 DataSource dataSource = DBConfig |
| 147 .getInstance() | 145 .getInstance() |
| 148 .getDBConnection() | 146 .getDBConnection() |
| 149 .getDataSource(); | 147 .getDataSource(); |
| 150 | 148 |
| 151 Connection userConnection = dataSource.getConnection(); | 149 Connection userConnection = dataSource.getConnection(); |
| 152 try { | 150 try { |
| 153 connections.add(new Builder.NamedConnection( | 151 connections.add(new Builder.NamedConnection( |
| 154 Builder.CONNECTION_SYSTEM, userConnection, false)); | 152 Builder.CONNECTION_USER, userConnection)); |
| 153 | |
| 154 connections.add(new Builder.NamedConnection( | |
| 155 Builder.CONNECTION_SYSTEM, systemConnection, false)); | |
| 155 | 156 |
| 156 userBuilder.build(connections, result, parameters); | 157 userBuilder.build(connections, result, parameters); |
| 157 } | 158 } |
| 158 finally { | 159 finally { |
| 159 userConnection.close(); | 160 userConnection.close(); |