Changeset 245 for trunk/grails-app/taglib

Timestamp:

Mar 8, 2010, 5:53:30 PM (14 years ago)

Author:

tabma

Message:

• columnmapping added

File:

• trunk/grails-app/taglib/dbnp/importer/ImporterTagLib.groovy (modified) (5 diffs)

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

@@ -19 +19 @@
 class ImporterTagLib {
     static namespace = 'importer'
-    def standardentities = [[type:0, name:"Study"], [type:1, name:"Subject"], [type:2, name:"Event"],
+    def standardentities = [[type:-1, name:"Don't import"], [type:0, name:"Study"], [type:1, name:"Subject"], [type:2, name:"Event"],
                         [type:3, name:"Protocol"], [type:4, name:"Sample"]]
 
@@ -43 +43 @@
 
     /**
-     * @param entities array of entity:columnindex values
+     * @param entities array in the format of columnindex:entitytype format
      */
     def properties = { attrs ->
@@ -51 +51 @@
         attrs['entities'].each { se ->
             def temp = se.split(":")
-            def entity = [type:temp[0],columnindex:temp[1]]
+            def entity = [type:temp[1],columnindex:temp[0]]
             selectedentities.add(entity)
         }
@@ -62 +62 @@
 
         options.each { e ->
-            res += "<option value=\"${e.type}:${customvalue}\""
+            res += "<option value=\"${customvalue}:${e.type}\""
             res += (e.type.toInteger() == selected) ? " selected" : ""
             res += ">${e.name}</option>"
@@ -84 +84 @@
 
         switch (attrs['entitytype']) {
-            case 0  : createSelect(-1, "property", t.fields, "1")
-                     break
+            case 0  : createPropertySelect(attrs['name'], t.fields, columnindex)
+                      break
             case 1  : break
             case 2  : break
             case 3  : break
-            default : out << createPropertySelect("property", t.fields, columnindex)
+            default : out << createPropertySelect(attrs['name'], t.fields, columnindex)
                      break
         }