Changeset 16 for trunk/grails-app

Timestamp:

Feb 28, 2011, 10:46:51 AM (12 years ago)

Author:

robert@…

Message:

Improvement of the synchronization error handling and changes for deploying the module to dbnptest

Location:

trunk/grails-app

Files:

• conf/config-dbnptest.properties (added)
• conf/config-development.properties (modified) (1 diff)
• controllers/nl/tno/metagenomics/integration/SynchronizeController.groovy (modified) (2 diffs)
• domain/nl/tno/metagenomics/auth/User.groovy (modified) (1 diff)
• services/nl/tno/metagenomics/integration/SynchronizationService.groovy (modified) (3 diffs)
• views/synchronize/full.gsp (modified) (1 diff)

trunk/grails-app/conf/config-development.properties

@@ -7 +7 @@
 # server URL
 grails.serverURL=http://localhost:8184/metagenomics
+grails.server.port.http=8184
 
 # DATABASE

trunk/grails-app/controllers/nl/tno/metagenomics/integration/SynchronizeController.groovy

@@ -10 +10 @@
                 
                 if( !redirectUrl )
-                        redirectUrl = g.createLink( controller: 'study' );
+                        redirectUrl = g.createLink( controller: 'run' );
                 
                 // Set the date of last synchronization to now. Doing it here, prevents the 
@@ -18 +18 @@
                 //                      etc...
                 // synchronizationService.lastFullSynchronization = new Date();
-                        
                 [ url: redirectUrl ]
         }
         
         def perform = {
-                synchronizationService.sessionToken = session.sessionToken
-                synchronizationService.user = session.user
-
-                synchronizationService.fullSynchronization();
-
-                render "";
+                try {
+                        synchronizationService.sessionToken = session.sessionToken
+                        synchronizationService.user = session.user
+        
+                        synchronizationService.fullSynchronization();
+                        render "";
+                } catch( Exception e ) {
+                        // Catch all exceptions, show them to the user (by rendering a text message) and print a stacktrace
+                        log.error "Exception during full synchronization: " + e.getMessage()
+                        e.printStackTrace()
+                        
+                        render "An error occurred during synchronization (" + e.class?.name + "): " + e.getMessage();
+                }
         }
 }

trunk/grails-app/domain/nl/tno/metagenomics/auth/User.groovy

@@ -15 +15 @@
         
         static mapping = {
+                table 'gscfuser'
                 auth cascade: "all-delete-orphan"
         }

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

@@ -634 +634 @@
                                         // Update the sample object if necessary
                                         sampleFound.name = gscfSample.name
-                                        sampleFound.subject = gscfSample.subject
-                                        sampleFound.event = gscfSample.event + ( gscfSample.startTime ? " (" + gscfSample.startTime + ")" : "" )
+                                        sampleFound.subject = gscfSample.subject.toString()
+                                        sampleFound.event = gscfSample.event.toString() + ( gscfSample.startTime ? " (" + gscfSample.startTime + ")" : "" )
                                         sampleFound.save();
                                 } else {
@@ -648 +648 @@
                                                 // Update the sample object if necessary
                                                 sampleFound.name = gscfSample.name
-                                                sampleFound.subject = gscfSample.subject
-                                                sampleFound.event = gscfSample.event + ( gscfSample.startTime ? " (" + gscfSample.startTime + ")" : "" )
+                                                sampleFound.subject = gscfSample.subject.toString()
+                                                sampleFound.event = gscfSample.event.toString() + ( gscfSample.startTime ? " (" + gscfSample.startTime + ")" : "" )
                                                 sampleFound.save();
                                         } else {
@@ -656 +656 @@
                                                 // If it doesn't exist, create a new object
                                                 sampleFound = new Sample( sampleToken: gscfSample.sampleToken, name: gscfSample.name, study: assay.study );
-                                                sampleFound.subject = gscfSample.subject
-                                                sampleFound.event = gscfSample.event + ( gscfSample.startTime ? " (" + gscfSample.startTime + ")" : "" )
+                                                sampleFound.subject = gscfSample.subject.toString()
+                                                sampleFound.event = gscfSample.event.toString() + ( gscfSample.startTime ? " (" + gscfSample.startTime + ")" : "" )
                                                 assay.study.addToSamples( sampleFound );
                                                 sampleFound.save();

trunk/grails-app/views/synchronize/full.gsp

@@ -26 +26 @@
                                                 window.location.refresh();
                                         } else {
+                                                alert( "Redirect to: ${url.encodeAsJavaScript()}" );
                                                 if( confirm( "Would you like to continue to the original page?") ) {
                                                         window.location.replace( "${url.encodeAsJavaScript()}" );