# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1312130988 0
# Node ID aabcca7aeb6c90452ce2af5dae1d195b7071bc2b
# Parent  5b467bc27eda67c109355d1d5c897eaebb712026
Fixed datacage db scheme. add some debug output.

flys-artifacts/trunk@2426 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 5b467bc27eda -r aabcca7aeb6c flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Fri Jul 29 13:29:29 2011 +0000
+++ b/flys-artifacts/ChangeLog	Sun Jul 31 16:49:48 2011 +0000
@@ -1,3 +1,10 @@
+2011-07-29  Sascha L. Teichmann <sascha.teichmann@intevation.de>
+
+	* doc/conf/datacage.sql: Fixed constraint.
+
+	* src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java:
+	  Added some debug output.
+
 2011-07-29  Sascha L. Teichmann <sascha.teichmann@intevation.de>
 
 	* doc/conf/datacage.sql: Removed artifact_id from facet because there
diff -r 5b467bc27eda -r aabcca7aeb6c flys-artifacts/doc/conf/datacage.sql
--- a/flys-artifacts/doc/conf/datacage.sql	Fri Jul 29 13:29:29 2011 +0000
+++ b/flys-artifacts/doc/conf/datacage.sql	Sun Jul 31 16:49:48 2011 +0000
@@ -62,7 +62,7 @@
     num         INT             NOT NULL,
     state       VARCHAR(256)    NOT NULL,
     description VARCHAR(256),
-    UNIQUE (artifact_id, out_id, num, name)
+    UNIQUE (out_id, num, name)
 );
 
 -- DROP SEQUENCE USERS_ID_SEQ;
diff -r 5b467bc27eda -r aabcca7aeb6c flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java	Fri Jul 29 13:29:29 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java	Sun Jul 31 16:49:48 2011 +0000
@@ -437,6 +437,7 @@
         }
 
         public boolean scan(ArtifactDatabase adb) {
+            log.debug("scan");
             try {
                 adb.loadAllArtifacts(this);
             }
@@ -508,8 +509,9 @@
 
     @Override
     public void systemUp(GlobalContext context) {
-        log.debug("systemUp");
+        log.debug("systemUp entered");
         initialScan(context);
+        log.debug("systemUp leaved");
     }
 
     protected void initialScan(GlobalContext context) {
@@ -540,15 +542,25 @@
 
     protected boolean cleanDatabase() {
 
-        return sqlExecutor.new Instance() {
+        log.debug("cleanDatabase");
+
+        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");
                 conn.commit();
+                log.debug("commit");
                 return true;
             }
         }.runWrite();
+
+        log.debug("after runWrite(): " + success);
+
+        return success;
     }