Changeset 1058 for trunk/grails-app/services/dbnp/importer

Timestamp:

Nov 3, 2010, 2:03:20 PM (12 years ago)

Author:

t.w.abma@…

Message:

• added failed cells view/logic
• fixed Study-owner bug

File:

• trunk/grails-app/services/dbnp/importer/ImporterService.groovy (modified) (5 diffs)

trunk/grails-app/services/dbnp/importer/ImporterService.groovy

@@ -31 +31 @@
 
 class ImporterService {
+    def AuthenticationService
 
     boolean transactional = true
@@ -236 +237 @@
      *
      * @param datamatrix two dimensional array containing entities and possibly also failed cells
-     * @return array of failed cells
+     * @return array of failed cells in [rownum:n, value:xxx] format
      * */
     def getFailedCells(datamatrix) {
@@ -244 +245 @@
             record.each { column ->
                 column.each {
-                    if (it.getClass().getName().equals('java.util.LinkedHashMap$Entry')) {
-                        println it.key
-                        println it.value
+                    if (it.getClass().getName().equals('java.util.LinkedHashMap$Entry')) {                        
                         failedcells.add(it)
                     }
@@ -274 +273 @@
                         switch (entity.getClass()) {
                         case Study       :  print "Persisting Study `" + entity + "`: "
+                                                entity.owner = AuthenticationService.getLoggedInUser()
                                                 if (persistEntity(entity)) validatedSuccesfully++
                                                 break
@@ -447 +447 @@
                                 } catch (IllegalArgumentException iae) {
                                     // leave the field empty and let the user choose the ontology manually in a later step
-                                    failed.put(mc, value)
-                                    println "failed ("+mc.templatefieldtype+"`" + value + "`"
+                                    failed.put(mc, [rownum:excelrow.getRowNum(), value:value])
+                                    //println "failed ("+mc.templatefieldtype+"`" + value + "`"
                                 }
                         } // end