Changeset 321 for trunk/grails-app

Timestamp:

Mar 31, 2010, 2:02:35 PM (11 years ago)

Author:

tabma

Message:

• identifying columns get stored using 'name' attribute of entities as identifier

Location:

trunk/grails-app

Files:

• controllers/dbnp/importer/ImporterController.groovy (modified) (4 diffs)
• domain/dbnp/studycapturing/TemplateEntity.groovy (modified) (1 diff)
• services/dbnp/importer/ImporterService.groovy (modified) (1 diff)
• taglib/dbnp/importer/ImporterTagLib.groovy (modified) (1 diff)
• views/importer/common/_preview.gsp (modified) (1 diff)

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

@@ -77 +77 @@
         def entities  = request.getParameterValues("entity")
         def templatefieldtypes = request.getParameterValues("templatefieldtype")
+        def identifiercolumnindex = params.identifier.toInteger()
 
-        templatefieldtypes.each { t ->
-            def temp = t.split(":")
-            def templatefieldtype = temp[1]         
+        templatefieldtypes.each { t ->      
+            def columnindex = t.split(":")[0].toInteger()
+            def templatefieldtype = t.split(":")[1]
             
             switch (templatefieldtype) {
@@ -101 +102 @@
                 default: break
             }
-            session.header[temp[0].toInteger()].templatefieldtype = tft
+            session.header[columnindex].templatefieldtype = tft
         }
 
-        entities.each { e ->
-            def temp = e.split(":")
+        entities.each { e ->                
+            def columnindex = e.split(":")[0].toInteger()
+            def entitytype = e.split(":")[1].toInteger()
             Class clazz     
 
-            switch (temp[1].toInteger()) {
+            switch (entitytype) {
                 case 0: clazz = Study
                         break
@@ -123 +125 @@
             }
 
-            session.header[temp[0].toInteger()].index = temp[0].toInteger()
-            session.header[temp[0].toInteger()].entity = clazz
+            session.header[columnindex].identifier = (columnindex == identifiercolumnindex) ? true : false
+            session.header[columnindex].index = columnindex
+            session.header[columnindex].entity = clazz
         }
 
@@ -142 +145 @@
         def columnproperties  = request.getParameterValues("columnproperty")
 
-        columnproperties.each { cp ->
-                def temp = cp.split(":")
-                session.header[temp[0].toInteger()].property = TemplateField.get(temp[1].toInteger())
+        columnproperties.each { cp ->           
+                def columnindex = cp.split(":")[0].toInteger()
+                def property_id = cp.split(":")[1].toInteger()
+                session.header[columnindex].property = TemplateField.get(property_id)           
         }
 

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

@@ -91 +91 @@
                 // First, search if there is an entity property with the given name, and if so, set that
                 if (this.properties.containsKey(fieldName)) {
-                        this[fieldName] = value
+                        this[fieldName] = value                 
                 }
                 // If not the found, then it is a template field, so check if there is a template

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

@@ -267 +267 @@
             switch(mc.entity) {
                 case Study      :   (record.any {it.getClass()==mc.entity}) ? 0 : record.add(study)
+                                    if (mc.identifier) { study.title = value; break }
                                     study.setFieldValue(mc.property.name, value)
                                     break
                 case Subject    :   (record.any {it.getClass()==mc.entity}) ? 0 : record.add(subject)
+                                    if (mc.identifier) { subject.name = value; break }
                                     subject.setFieldValue(mc.property.name, value)
                                     break
                 case Event      :   (record.any {it.getClass()==mc.entity}) ? 0 : record.add(event)
+                                    if (mc.identifier) { event.eventdescription = value; break }
                                     event.setFieldValue(mc.property.name, value)
                                     break
                 case Protocol   :   (record.any {it.getClass()==mc.entity}) ? 0 : record.add(protocol)
+                                    if (mc.identifier) { protocol.name = value; break }
                                     protocol.setFieldValue(mc.property.name, value)
                                     break
                 case Sample     :   (record.any {it.getClass()==mc.entity}) ? record.add(sample) : 0
+                                    if (mc.identifier) { sample.name = value; break }
                                     sample.setFieldValue(mc.property.name, value)
                                     break

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

@@ -86 +86 @@
         def t = Template.get(session.importtemplate_id) 
         def mc = attrs['mappingcolumn']
-        
-        out << createPropertySelect(attrs['name'], t.fields.findAll { it.type == mc.templatefieldtype }, mc.index)
+
+        (mc.identifier) ? out << "<select style=\"font-size:10px\" name=\"\" disabled><option>Identifier</option></select>":
+            out << createPropertySelect(attrs['name'], t.fields.findAll { it.type == mc.templatefieldtype }, mc.index)
     }
 

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

@@ -34 +34 @@
 
         <tr>
-            <td>Celltype:</td>
+            <td>Fieldtype:</td>
             <g:each var="column" in="${header}">
                 <td class="header">