Changeset 1103 for trunk/grails-app/services/dbnp

Timestamp:

Nov 9, 2010, 10:14:23 AM (12 years ago)

Author:

t.w.abma@…

Message:

• added error page for importer
• empty ontologies detected in Excel still should be shown as "unknown" fields in the failed ontology-mapping step

File:

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

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

@@ -258 +258 @@
     def saveCorrectedCells(datamatrix, failedcells, correctedcells) {       
         // Loop through all failed cells
+
         failedcells.each { mcrecord ->
             mcrecord.each { mappingcolumn ->
@@ -265 +266 @@
                   // Find the record in the table which the mappingcolumn belongs to
                   def tablerecord = datamatrix.find { it.hashCode() == mcrecord.key }
-                  
+
                   // Loop through all entities in the record
                   tablerecord.each { rec ->
-                      rec.each { entity ->                          
+                      rec.each { entity ->
                             try {
                                 // Update the entity field
@@ -280 +281 @@
                   } // end of table record
             } // end of mapping record
-        } // end of failed cells loop
+        } // end of failed cells loop     
     }
    
@@ -425 +426 @@
                 def df = new DataFormatter()
                 def template = Template.get(template_id)
+                def tft = TemplateFieldType
                 def record = [] // list of entities and the read values
                 def failed = [] // list of failed columns [mappingcolumn] with the value which couldn't be mapped into the entity
@@ -449 +451 @@
                                 }
 
+
+                                //println "temateplfedielfdtype=" + mc.templatefieldtype
+                                // Are we trying to map an ontology term which is empty? Then it is a failed cell
+                                /*if (value=="") {
+                                    println "empty term"
+                                    def temp = new MappingColumn()
+                                    //temp.properties = mc.properties
+                                    temp.value = "undefined"
+                                    failed.add(temp)
+                                }*/
+                              
+
                                 try {
+                                    /*if ((mc.templatefieldtype == TemplateFieldType.ONTOLOGYTERM) && (value == ""))
+                                        {
+                                            def temp = new MappingColumn()
+                                            temp.properties = mc.properties
+                                            temp.value="unknown"
+                                            failed.add(temp)
+                                        }*/
 
                                 // which entity does the current cell (field) belong to?
@@ -476 +497 @@
                                     def temp = new MappingColumn()
                                     temp.properties = mc.properties
-                                    temp.value = value                                    
+                                    temp.value = value
                                     failed.add(temp)
                                 }