Changeset 897

Timestamp:

Sep 21, 2010, 10:58:35 AM (13 years ago)

Author:

keesvb

Message:

fixed multiple bugs in importer, really implemented the header and start row functionality, updated Ontology setter with proper error message

Location:

trunk/grails-app

Files:

• controllers/dbnp/importer/ImporterController.groovy (modified) (1 diff)
• domain/dbnp/studycapturing/TemplateEntity.groovy (modified) (1 diff)
• services/dbnp/importer/ImporterService.groovy (modified) (3 diffs)

trunk/grails-app/controllers/dbnp/importer/ImporterController.groovy

@@ -258 +258 @@
 
         //import workbook
-        session.importer_importeddata = ImporterService.importdata(session.importer_template_id, session.importer_workbook, 0, 1, session.importer_header)
+        session.importer_importeddata = ImporterService.importdata(session.importer_template_id, session.importer_workbook, session.importer_sheetindex, session.importer_datamatrix_start, session.importer_header)
 
         if (params.layout=="horizontal")

trunk/grails-app/domain/dbnp/studycapturing/TemplateEntity.groovy

@@ -625 +625 @@
                                         value = term
                                 }
+                                // TODO: search ontology for the term online (it may still exist) and insert it into the Term cache
+                                // if not found, throw exception
+                                else {
+                                        throw new IllegalArgumentException("Ontology term not recognized (not in the GSCF ontology cache): ${value} when setting field ${fieldName}")
+                                }
                         }
                 }

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

@@ -66 +66 @@
             def datamatrix_celldata = df.formatCellValue(sheet.getRow(datamatrix_start).getCell(columnindex))
             def datamatrix_cell     = sheet.getRow(datamatrix_start).getCell(columnindex)
-            def headercell = sheet.getRow(sheet.getFirstRowNum()).getCell(columnindex)
+            println "frn is "+sheet.getFirstRowNum()
+                def headercell = sheet.getRow(headerrow-1+sheet.getFirstRowNum()).getCell(columnindex)
             def tft = TemplateFieldType.STRING //default templatefield type
 
@@ -247 +248 @@
         datamatrix.each { record ->
             record.each { entity ->
-                if(entity.validate()) {
-                    switch (entity.getClass()) {
+                        switch (entity.getClass()) {
                         case Study       :  print "Persisting Study `" + entity + "`: "
-                                            persistEntity(entity)
-                                            break
+                                                if (persistEntity(entity)) validatedSuccesfully++
+                                                break
                         case Subject     :  print "Persisting Subject `" + entity + "`: "
-                                            persistEntity(entity)
-                                            study.addToSubjects(entity)
-                                            break
+                                                study.addToSubjects(entity)
+                                                if (persistEntity(entity)) validatedSuccesfully++
+                                                break
                         case Event       :  print "Persisting Event `" + entity + "`: "
-                                            persistEntity(entity)
-                                            study.addToEvents(entity)
-                                            break
+                                                study.addToEvents(entity)
+                                                if (persistEntity(entity)) validatedSuccesfully++
+                                                break
                         case Sample      :  print "Persisting Sample `" + entity +"`: "
-                                            persistEntity(entity)
-                                            study.addToSamples(entity)
-                                            break
+                                                study.addToSamples(entity)
+                                                if (persistEntity(entity)) validatedSuccesfully++
+                                                break
                         case SamplingEvent: print "Persisting SamplingEvent `" + entity + "`: "
-                                            persistEntity(entity)
-                                            study.addToSamplingEvents(entity)
-                                            break;
+                                                study.addToSamplingEvents(entity)
+                                                if (persistEntity(entity)) validatedSuccesfully++
+                                                break;
                         default          :  println "Skipping persisting of `" + entity.getclass() +"`"
-                                            break
-                    } // end switch
-                    validatedSuccesfully++
-                } // end if
+                                                break
+                        } // end switch
             } // end record
         } // end datamatrix
@@ -285 +283 @@
      * 
      */
-    def persistEntity(entity) { 
-         if (!entity.save()) //.merge?
-            entity.errors.allErrors.each {
-            println it
+    boolean persistEntity(entity) {
+            println "persisting ${entity}"
+            // if not validated
+                if (entity.validate()) {
+                        if (entity.save()) { //.merge?
+                                return true
+                        }
+                        else { // if save was unsuccesful
+                                entity.errors.allErrors.each {
+                                        println it
+                                }
+                                return false
+                        }
+                }
+            else { // if not validated
+                    entity.errors.each {
+                            println it
+                    }
+                        return false
+            }
          }
-    }
 
         /**