Changeset 1121

Timestamp:

Nov 11, 2010, 2:29:16 PM (13 years ago)

Author:

t.w.abma@…

Message:

• rewrote part of the importer and added a ImportRecord? and ImportCell? domain
• ontologies should now always be shown individually

Location:

trunk

Files:

• grails-app/controllers/dbnp/importer/ImporterController.groovy (modified) (1 diff)
• grails-app/domain/dbnp/importer/ImportCell.groovy (added)
• grails-app/domain/dbnp/importer/ImportRecord.groovy (added)
• grails-app/domain/dbnp/importer/MappingColumn.groovy (modified) (1 diff)
• grails-app/services/dbnp/importer/ImporterService.groovy (modified) (6 diffs)
• grails-app/views/importer/common/_failedcells.gsp (modified) (1 diff)
• grails-app/views/importer/common/_missingproperties.gsp (modified) (1 diff)
• test/unit/dbnp/importer/CellTests.groovy (added)
• test/unit/dbnp/importer/ImportRecordTests.groovy (added)

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

@@ -170 +170 @@
 
         // Loop through the form with cell fields and values
-        params.cell.index.each { mappingcolumnhash, value ->
-            correctedcells.put(mappingcolumnhash, value)
+        params.cell.index.each { cellhash, value ->
+            correctedcells.put(cellhash, value)
         }
 

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

@@ -1 +1 @@
 package dbnp.importer
 import dbnp.studycapturing.TemplateField
+import dbnp.studycapturing.Identity
 
 /**

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

@@ -219 +219 @@
         def sheet = wb.getSheetAt(sheetindex)
         def table = []
-        def failedcells = [:] // map [recordhash, [mappingcolumnlist]] values
+        def failedcells = [:] // map [recordhash, importrecord] values
         
         // walk through all rows and fill the table with records
-        (rowindex..sheet.getLastRowNum()).each { i ->
-            //table.add(createRecord(template_id, sheet.getRow(i), mcmap))
+        (rowindex..sheet.getLastRowNum()).each { i ->       
             // Create an entity record based on a row read from Excel and store the cells which failed to be mapped
             def (record, failed) = createRecord(template_id, sheet.getRow(i), mcmap)
@@ -232 +231 @@
             // If failed cells have been found, add them to the failed cells map
             // the record hashcode is later on used to put the failed data back
-            // in the data matrix
-            if (failed.size()!=0) failedcells.put(record.hashCode(), failed)
+            // in the data matrix            
+            if (failed.importcells.size()>0) failedcells.put(record.hashCode(), failed)
         }
-
-        failedcells.each { record ->
-           record.each { cell ->
-               cell.each {
-                   println it.value.dump()
-               }
-            }
-        }
-
 
         return [table,failedcells]
@@ -257 +247 @@
      **/
     def saveCorrectedCells(datamatrix, failedcells, correctedcells) {       
-        // Loop through all failed cells
-
-        failedcells.each { mcrecord ->
-            mcrecord.each { mappingcolumn ->
+        
+        // Loop through all failed cells (stored as
+        failedcells.each { record ->
+            record.value.importcells.each { cell ->
+
                   // Get the corrected value
-                  def correctedvalue = correctedcells.find { it.key.toInteger() == mappingcolumn.hashCode()}.value
+                  def correctedvalue = correctedcells.find { it.key.toInteger() == cell.getIdentifier()}.value
 
                   // 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
+                  def tablerecord = datamatrix.find { it.hashCode() == record.key }
+
+                  // Loop through all entities in the record and correct them if necessary
                   tablerecord.each { rec ->
                       rec.each { entity ->
                             try {
                                 // Update the entity field
-                                entity.setFieldValue(mappingcolumn.value.property[0], correctedvalue)
-                                println "Adjusted " + mappingcolumn.value.property[0] + " to " + correctedvalue
+                                entity.setFieldValue(cell.mappingcolumn.property, correctedvalue)
+                                //println "Adjusted " + cell.mappingcolumn.property + " to " + correctedvalue
                             }
                             catch (Exception e) {
-                                println "Could not map corrected ontology"
+                                //println "Could not map corrected ontology: " + cell.mappingcolumn.property + " to " + correctedvalue
                             }
                       }
                   } // end of table record
-            } // end of mapping record
-        } // end of failed cells loop     
+               } // end of cell record
+            } // end of failedlist
     }
    
@@ -428 +419 @@
                 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
+                def failed = new ImportRecord() // list of failed cells with the value which couldn't be mapped into the entity
 
                 // Initialize all possible entities with the chosen template
@@ -460 +451 @@
                                     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?
                                     switch (mc.entity) {
@@ -495 +478 @@
                                 } catch (IllegalArgumentException iae) {
                                     // store the mapping column and value which failed
-                                    def temp = new MappingColumn()
-                                    temp.properties = mc.properties
-                                    temp.value = value
-                                    failed.add(temp)
+                                    def mcInstance = new MappingColumn()
+                                    mcInstance.properties = mc.properties
+                                    failed.addToImportcells(
+                                        new ImportCell(mappingcolumn:mcInstance,
+                                            value:value)
+                                        )
                                 }
                         } // end
                 } // end for
-        
         // a failed column means that using the entity.setFieldValue() threw an exception        
         return [record, failed]        

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

@@ -31 +31 @@
   </tr>
 <g:form name="failedcellsform" action="saveCorrectedCells">
-        <g:each var="record" in="${failedcells}">
-          <g:each var="list" in="${record}">
-            <g:each var="cell" in="${list}">
+        <g:each var="item" in="${failedcells}"> <!-- [recordhash, importrecord] -->
+          <g:each var="cell" in="${item.value.importcells}">
             <tr>
-              <td>${cell.value.name}</td>
+              <td>${cell.mappingcolumn.name}</td>
               <td>-</td>
-              <td>${cell.value.value}</td>
+              <td>${cell}</td>
               <td>
-                  <input type="text" name="cell.index.${cell.hashCode()}" rel="ontology-all-name"/>
-                  <!-- <input type="hidden" name="cell.index.${cell.value}-concept_id"/>
-                  <input type="hidden" name="cell.index.${cell.value}-ontology_id"/>
-                  <input type="hidden" name="cell.index.${cell.value}-full_id"/> -->
+                  <input type="text" name="cell.index.${cell.getIdentifier()}" rel="ontology-all-name"/>
+                  <!-- <input type="hidden" name="cell.index.${cell}-concept_id"/>
+                  <input type="hidden" name="cell.index.${cell}-ontology_id"/>
+                  <input type="hidden" name="cell.index.${cell}-full_id"/> -->
               </td>
-            </tr>
-            </g:each>
+            </tr>            
           </g:each>
         </g:each>

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

@@ -25 +25 @@
         <g:set var="showHeader" value="${true}"/>
             <g:each status="index" var="table" in="${datamatrix}">
-                <g:each status="i" var="entity" in="${table}">                  
+                <g:each status="i" var="entity" in="${table}">
                     <g:if test="${showHeader}">
                         <g:set var="showHeader" value="${false}"/>