Changeset 18 for trunk/grails-app/services/nl

Timestamp:

Mar 8, 2011, 11:59:30 AM (12 years ago)

Author:

robert@…

Message:

Fixed issue #11: export of excel sample data is now column wise

Location:

trunk/grails-app/services/nl/tno/metagenomics

Files:

• SampleExcelService.groovy (modified) (2 diffs)
• integration/GscfService.groovy (modified) (3 diffs)

trunk/grails-app/services/nl/tno/metagenomics/SampleExcelService.groovy

@@ -304 +304 @@
                 }
                 
+                // Transpose data and create new headers
+                data = data.transpose();
+                
+                // Add field names in front of the data
+                for( int i = 0; i < data.size(); i++ ) {
+                        data[ i ] = [] + fields[ "descriptions" ][ "all" ][ i ] + data[ i ]
+                }
+                
                 // Create excel file
                 def sheetIndex = 0;
@@ -311 +319 @@
 
                 // Put the headers on the first row
-                excelService.writeHeader( wb, fields[ "descriptions" ][ "all" ], sheetIndex );
-                excelService.writeData( wb, data, sheetIndex, 1 );
+                //excelService.writeHeader( wb, data[ 0 ], sheetIndex );
+                excelService.writeData( wb, data, sheetIndex, 0 );
 
                 // Auto resize columns

trunk/grails-app/services/nl/tno/metagenomics/integration/GscfService.groovy

@@ -82 +82 @@
                         return user
                 } catch( Exception e ) {
+                        e.printStackTrace();
+                        return null
                         throw new Exception( "Retrieving user details from GSCF failed", e );
                 }
@@ -328 +330 @@
                         throw new Exception( "Calling GSCF Rest method ${restMethod} failed. Please check log for more information.", e )
                 }
-
+                
                 switch( connection.responseCode ) {
                         case 400:       // Bad request
@@ -337 +339 @@
                                 break;
                         case 403:       // Incorrect authentication
+                                println "Not authenticated (" + addr + "): " + connection.responseCode
                                 throw new NotAuthenticatedException( "User is not authenticated with GSCF." );
                                 break;