Changeset 669

Timestamp:

Jul 20, 2010, 4:21:50 PM (12 years ago)

Author:

tabma

Message:

• added "Don' t import" functionality which ignores columns

Location:

trunk/grails-app

Files:

• controllers/dbnp/importer/ImporterController.groovy (modified) (2 diffs)
• domain/dbnp/importer/MappingColumn.groovy (modified) (1 diff)
• services/dbnp/importer/ImporterService.groovy (modified) (5 diffs)
• taglib/dbnp/importer/ImporterTagLib.groovy (modified) (2 diffs)

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

@@ -119 +119 @@
             table.each { entity ->
                 entity.giveFields().each { field ->
-                    print ":" + params["entity_" + entity.hashCode() + "_" + field.escapedName()]
+                    //print ":" + params["entity_" + entity.hashCode() + "_" + field.escapedName()]
                     entity.setFieldValue (field.toString(), params["entity_" + entity.hashCode() + "_" + field.escapedName()])
                 }               
@@ -223 +223 @@
                 // Store the selected property for this column into the column map for the ImporterService
                 session.importer_header[columnindex.toInteger()].property = property
+
                 // Look up the template field type of the target TemplateField and store it also in the map
-                session.importer_header[columnindex.toInteger()].templatefieldtype = entityObj.getFieldType(property)
+                session.importer_header[columnindex.toInteger()].templatefieldtype = entityObj.giveFieldType(property)
+
+                // Is a "Don't import" property assigned to the column?
+                session.importer_header[columnindex.toInteger()].dontimport = (property=="dontimport") ? true : false
 
                 //if it's an identifier set the mapping column true or false

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

@@ -20 +20 @@
         String value
         Boolean identifier
+        Boolean dontimport
 
     static constraints = {
             name(unique: true)
+            dontimport(default:false)
     }
 

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

@@ -171 +171 @@
             
             (0..header.size()-1).each { columnindex ->
-                def c = sheet.getRow(rowindex).getCell(columnindex, org.apache.poi.ss.usermodel.Row.CREATE_NULL_AS_BLANK)
-                println "DAS " + columnindex + ":" + c
+                def c = sheet.getRow(rowindex).getCell(columnindex, org.apache.poi.ss.usermodel.Row.CREATE_NULL_AS_BLANK)               
                 row.add(c)
+                //if (c.getCellType() == c.CELL_TYPE_STRING) println "STR"+c.getStringCellValue()
+                //if (c.getCellType() == c.CELL_TYPE_NUMERIC) println "INT" +c.getNumericCellValue()
             }
                 //row.add(df.formatCellValue(c))
@@ -224 +225 @@
         def sheet = wb.getSheetAt(sheetindex)
         def table = []
-
         
         // walk through all rows        
@@ -242 +242 @@
         return table    
     }
-    
-     /**
-                     // start transaction
-                        def transaction = sessionFactory.getCurrentSession().beginTransaction()
-                              // persist data to the database
-                                try {
-                                   // commit transaction
-                                        println "commit"
-                                        transaction.commit()
-                                        success()
-                                } catch (Exception e) {
-                                        // rollback
-                                        // stacktrace in flash scope
-                                        flash.debug = e.getStackTrace()
-
-                                        println "rollback"
-                                        transaction.rollback()
-                                        error()
-                                }
-      */
-
+   
     /**
      * Method to store a matrix containing the entities in a record like structure. Every row in the table
@@ -332 +312 @@
             def value
 
-            try {
-                 value = formatValue(df.formatCellValue(cell), mc.templatefieldtype)
-            } catch (NumberFormatException nfe) {
-                 value = ""
-            }
+            if (!mc.dontimport) {
+                /*try {
+                 value = formatValue(df.formatCellValue(cell), mc.templatefieldtype)
+                } catch (NumberFormatException nfe) {
+                 value = ""
+                }*/
+            value = df.formatCellValue(cell)
 
             switch(mc.entity) {
@@ -354 +336 @@
                                     break
             } // end switch
-        } // end for
+        } // end 
+    } // end for
 
         return record

trunk/grails-app/taglib/dbnp/importer/ImporterTagLib.groovy

@@ -16 +16 @@
 package dbnp.importer
 import dbnp.studycapturing.Template
+import dbnp.studycapturing.TemplateField
 import dbnp.studycapturing.TemplateFieldType
 import org.apache.poi.hssf.usermodel.HSSFCell
@@ -130 +131 @@
         def res = "<select style=\"font-size:10px\" name=\"${name}.index.${columnIndex}\">"
 
+        res += "<option value=\"dontimport\" selected>Don't import</option>"
+
         options.each { f ->
             res+= "<option value=\"${f.name}\">"