Changeset 1492 for trunk/grails-app

Timestamp:

Feb 4, 2011, 11:16:53 AM (10 years ago)

Author:

t.w.abma@…

Message:

• corrected StringList? items in the mappings page are now also correctly removed (just like Ontology terms) from the failedcells flow variable

Location:

trunk/grails-app

Files:

• controllers/dbnp/importer/ImporterController.groovy (modified) (3 diffs)
• domain/dbnp/importer/ImportCell.groovy (modified) (1 diff)
• services/dbnp/importer/ImporterService.groovy (modified) (2 diffs)
• views/importer/common/_missingproperties.gsp (modified) (1 diff)

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

@@ -466 +466 @@
                                         }
                                 } else {
-                                        removeFailedCell(flow.importer_failedcells, entity)
+                                        //removeFailedCell(flow.importer_failedcells, entity)
                                 } // end else if
 
@@ -472 +472 @@
                 } // end of table
 
-        println "invalidentities="+flow.importer_invalidentities
-
                 return (flow.importer_invalidentities == 0) ? true : false
         } // end of method
@@ -483 +481 @@
         def removeFailedCell(failedcells, entity, field) {
                 // Valid entity, remove it from failedcells
+        def entityidfield = "entity_" + entity.getIdentifier() + "_" + field.name.toLowerCase()
+
                 failedcells.each { record ->
                         def tempimportcells = []
 
-                        record.importcells.each { cell ->
-               // println "cell_entity=" + cell.value
-               // println "fieldname=" + field.name
-
+
+                        record.importcells.each { cell ->               
                                 // remove the cell from the failed cells session
-                                if (cell.entityidentifier != entity.getIdentifier()) {
+                                if (cell.entityidentifier != entityidfield) {
                                         //record.removeFromImportcells(cell)
                                         tempimportcells.add(cell)

trunk/grails-app/domain/dbnp/importer/ImportCell.groovy

@@ -19 +19 @@
 class ImportCell extends Identity {
     MappingColumn mappingcolumn
-    int entityidentifier
+    String entityidentifier
     String value
 

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

@@ -299 +299 @@
 
                                                 study.addToSubjects(entity)
+                                        println "subject persisting" + entity.dump()
 
                                                 break
@@ -466 +467 @@
                                         log.error ".import wizard error could not set property `" + mc.property + "` to value `" + value + "`"
                                         // store the mapping column and value which failed
-                                        def identifier
+                    def identifier
 
                                         switch (mc.entity) {
-                                                case Study: identifier = study.getIdentifier()
-                                                        break
-                                                case Subject: identifier = subject.getIdentifier()
-                                                        break
-                                                case SamplingEvent: identifier = samplingEvent.getIdentifier()
-                                                        break
-                                                case Event: identifier = event.getIdentifier()
-                                                        break
-                                                case Sample: identifier = sample.getIdentifier()
+                                                case Study: identifier = "entity_" + study.getIdentifier() + "_" + mc.property
+                                                        break
+                                                case Subject: identifier = "entity_" + subject.getIdentifier() + "_" + mc.property
+                                                        break
+                                                case SamplingEvent: identifier = "entity_" + samplingEvent.getIdentifier() + "_" + mc.property
+                                                        break
+                                                case Event: identifier = "entity_" + event.getIdentifier() + "_" + mc.property
+                                                        break
+                                                case Sample: identifier = "entity_" + sample.getIdentifier() + "_" + mc.property
                                                         break
                                                 case Object:   // don't import

trunk/grails-app/views/importer/common/_missingproperties.gsp

@@ -18 +18 @@
         <g:each in="${importer_failedcells}" var="record">
           <g:each in="${record.importcells}" var="cell">
-          var element = $("select[name=entity_${cell.entityidentifier}_${cell.mappingcolumn.property.toLowerCase()}]");
+          var element = $("select[name=${cell.entityidentifier}]");
 
           element.addClass('error')