Changeset 2613

Timestamp:

01/31/10 09:59:16 (2 years ago)

Author:

jvelde

Message:

Removed ForceCommit? option from CsvImport?. Improved transaction/error handling.

Location:

molgenis/3.3/src/org/molgenis

Files:

• generators/csv/CsvImportGen.java.ftl (modified) (5 diffs)
• model/elements/Entity.java (modified) (1 diff)

molgenis/3.3/src/org/molgenis/generators/csv/CsvImportGen.java.ftl

@@ -72 +72 @@
         public static void importAll(File directory, Database db, Tuple defaults) throws Exception
         {
-                importAll(directory,db,defaults,null, DatabaseAction.ADD, "NA", false);
-        }
-        
-        public static void importAll(File directory, Database db, Tuple defaults, boolean forceCommits) throws Exception
-        {
-                importAll(directory,db,defaults,null, DatabaseAction.ADD, "NA", forceCommits);
+                importAll(directory, db, defaults, null, DatabaseAction.ADD, "NA");
         }
 
@@ -84 +79 @@
          * TODO: add filter parameters...
          */
-        public static ImportResult importAll(File directory, Database db, Tuple defaults, List<String> components, DatabaseAction dbAction, String missingValue, boolean forceCommits) throws Exception
+        public static ImportResult importAll(File directory, Database db, Tuple defaults, List<String> components, DatabaseAction dbAction, String missingValue) throws Exception
         {
                 ImportResult result = new ImportResult();
@@ -90 +85 @@
                 try
                 {
-                        if(!db.inTx()){ db.beginTx(); }
+                        if (!db.inTx())
+                        {
+                                db.beginTx();
+                        }else{
+                                throw new DatabaseException("Cannot continue CsvImport: database already in transaction.");
+                        }
                                                 
                         if(dbAction.toString().startsWith("REMOVE"))
@@ -117 +117 @@
                                 {
                                         try {
-                                                if(forceCommits && !db.inTx()){ db.beginTx(); }
                                                 int count = new ${JavaName(entity)}CsvReader().importCsv(db, new File(directory+"/${entity.name?lower_case}.txt"), defaults, dbAction, missingValue);
                                                 result.getProgressLog().add("${entity.name?lower_case}");
                                                 result.getMessages().put("${entity.name?lower_case}",  "evaluated "+count+" ${entity.name?lower_case} elements");
-                                                if(forceCommits){ db.commitTx(); }
                                         } catch (Exception e) {
                                                 result.setErrorItem("${entity.name?lower_case}");
@@ -131 +129 @@
                         }                       
                         
-                        // insert back again...
                         logger.debug("commiting transactions...");
-                        if(db.inTx() && !forceCommits) db.commitTx();
+                        if (db.inTx()){
+                                db.commitTx();
+                        }else{
+                                throw new DatabaseException("Cannot commit CsvImport: database not in transaction.");
+                        }
                 }
                 catch (Exception e)
                 {
-                        logger.error("import failed: " + e.getMessage());
-                        logger.debug("rolling back transactions...");
-                        if(db.inTx()) db.rollbackTx();
-
+                        logger.error("Import failed: " + e.getMessage());
+                        if (db.inTx()){
+                                logger.debug("Db in transaction, rolling back...");
+                                db.rollbackTx();
+                        }else{
+                                logger.debug("Db not in transaction");
+                        }
                         e.printStackTrace();
+                        
+                        //Don't throw to avoid 'try-catch' on usage. No harm done.
                         //throw e;
                 }

molgenis/3.3/src/org/molgenis/model/elements/Entity.java

@@ -570 +570 @@
                         all_fields.put(f.getName(), f);
                 }
-                
-                
-                logger.info("herken " + all_fields.keySet());
                 return new Vector(all_fields.values());
         }