Changeset 72

Timestamp:

Jan 5, 2010, 11:21:31 AM (14 years ago)

Author:

ademcan

Message:

modification of domain classes organization

Location:

trunk

Files:

• application.properties (modified) (1 diff)
• grails-app/controllers/LoadController.groovy (modified) (7 diffs)
• grails-app/domain/dbnp/studycapturing/Study.groovy (added)
• test/unit/dbnp (added)
• test/unit/dbnp/studycapturing (added)
• test/unit/magetab (added)
• test/unit/magetab/adf (added)
• test/unit/magetab/idf (added)

trunk/application.properties

@@ +1 @@
+
 #Grails Metadata file
 #Tue Dec 29 14:59:12 CET 2009

trunk/grails-app/controllers/LoadController.groovy

@@ -16 +16 @@
     def index = {}
 
+    def get_string(ArrayList tmp_list) {
+        String value = tmp_list[1];
+        for (a in 2..tmp_list.size()-1){
+            value = value + " , " +tmp_list[a];
+        }
+        return value;
+    }
+
     def load = {
 
         //ArrayList attributes = new ArrayList();
 
-        render("Loading ...\n");
+        render("Loading ...<br>");
 
         InputStream inputStream = request.getFile("uploadfile").inputStream;
@@ -37 +45 @@
 
         for (i in fileReader.readLines()){
+            render(i);
             String line = i.toString() ;
             ArrayList tmp_list = new ArrayList();
@@ -72 +81 @@
                 }
                 else if (tmp_list[0]=="Experimental Design Term Source REF") {
-                    String term_ref = tmp_list[1];
-                    for (a in 2..tmp_list.size()-1){
-                        term_ref = term_ref + " , " +tmp_list[a];
-                    }
-                    experimentalInfo.design_term_source_ref = term_ref;
+                    String value = get_string(tmp_list);
+                    experimentalInfo.design_term_source_ref = value;
+                    render("value : " + value );
+                    println("value : "+value);
                 }
                 else if (tmp_list[0]=="Experimental Factor Name") {
@@ -93 +101 @@
                 }
                 else if (tmp_list[0]=="Experimental Factor Term Source REF") {
-                    experimentalInfo.factor_term_source_ref = tmp_list[1];
+                    String exp_ref  = tmp_list[1];
+                    for (a in 2..tmp_list.size()-1){
+                        exp_ref = exp_ref + " , " +tmp_list[a];
+                    }
+                    experimentalInfo.factor_term_source_ref = exp_ref;
                 }
                 else if (tmp_list[0]=="Person Last Name") {
@@ -174 +186 @@
                 }
                 else if (tmp_list[0]=="Protocol Name") {
-                    protocol.name = tmp_list[1];
-                }
+                    String protocol_name = tmp_list[1];
+                    for (a in 2..tmp_list.size()-1){
+                        protocol_name = protocol_name + " , " +tmp_list[a];
+                    }
+                    protocol.name = protocol_name;
+                }
+                //todo list of type
                 else if (tmp_list[0]=="Protocol Type") {
                     def type = new dbnp.transcriptomics.magetab.idf.OntologyTerm();
@@ -185 +202 @@
                 }
                 else if (tmp_list[0]=="Protocol Description") {
-                    protocol.description = tmp_list[1];
+                    String protocol_description = tmp_list[1];
+                    for (a in 2..tmp_list.size()-1){
+                        protocol_description = protocol_description + " , " +tmp_list[a];
+                    }
+                    protocol.description = protocol_description;
                 }
                 else if (tmp_list[0]=="Protocol Parameters") {
-                    protocol.parameters = tmp_list[1];
+                    String protocol_parameters = tmp_list[1];
+                    for (a in 2..tmp_list.size()-1){
+                        protocol_parameters = protocol_parameters + " , " +tmp_list[a];
+                    }
+                    protocol.parameters = protocol_parameters;
                 }
                 else if (tmp_list[0]=="Protocol Hardware") {
@@ -203 +228 @@
                 }
                 else if (tmp_list[0]=="SDRF File") {
-
+                    investigationDesign.sdrf_file = tmp_list[1];
                 }
                 else if (tmp_list[0]=="Term Source Name") {