Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java @ 996:f61fe8b561d2
Datacage: delete artifacts at initial scan, too. Fixed problem with writing content of state data.
flys-artifacts/trunk@2432 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Sun, 31 Jul 2011 19:47:41 +0000 |
parents | e0df86bc6d31 |
children | b0218f21c664 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java Sun Jul 31 19:07:02 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java Sun Jul 31 19:47:41 2011 +0000 @@ -40,6 +40,7 @@ "global.artifact.database"; private String SQL_DELETE_ALL_USERS = "delete.all.users"; + private String SQL_DELETE_ALL_ARTIFACTS = "delete.all.artifacts"; private String SQL_USER_ID_NEXTVAL = "user.id.nextval"; private String SQL_USER_BY_GID = "user.by.gid"; private String SQL_INSERT_USER = "insert.user"; @@ -317,7 +318,7 @@ if (type == null) type = "String"; stmnt.setString(3, type); stmnt.setString(4, sd.getName()); - setString(stmnt, 5, sd); + setString(stmnt, 5, sd.getValue()); stmnt.execute(); } @@ -466,6 +467,7 @@ protected void setupSQL(SQL sql) { SQL_DELETE_ALL_USERS = sql.get(SQL_DELETE_ALL_USERS); + SQL_DELETE_ALL_ARTIFACTS = sql.get(SQL_DELETE_ALL_ARTIFACTS); SQL_USER_ID_NEXTVAL = sql.get(SQL_USER_ID_NEXTVAL); SQL_USER_BY_GID = sql.get(SQL_USER_BY_GID); SQL_INSERT_USER = sql.get(SQL_INSERT_USER); @@ -550,13 +552,11 @@ boolean success = sqlExecutor.new Instance() { @Override public boolean doIt() throws SQLException { - log.debug("doIt"); prepareStatement(SQL_DELETE_ALL_USERS); - log.debug("prepareStatement"); stmnt.execute(); - log.debug("execute"); + prepareStatement(SQL_DELETE_ALL_ARTIFACTS); + stmnt.execute(); conn.commit(); - log.debug("commit"); return true; } }.runWrite();