Changeset 6

Timestamp:

Jan 19, 2011, 2:19:10 PM (12 years ago)

Author:

robert@…

Message:

Resolved two bugs in synchronization:

• full synchronization didn't work when no studies were present in the database (initial synchronization)
• synchronization didn't work with spaces in the end of a studyToken

Location:

trunk

Files:

• application.properties (modified) (2 diffs)
• grails-app/conf/BaseFilters.groovy (modified) (1 diff)
• grails-app/services/nl/tno/metagenomics/integration/GscfService.groovy (modified) (5 diffs)
• grails-app/services/nl/tno/metagenomics/integration/SynchronizationService.groovy (modified) (1 diff)
• grails-app/views/synchronize/full.gsp (modified) (1 diff)

trunk/application.properties

@@ -1 +1 @@
 #Grails Metadata file
-#Thu Dec 23 09:39:58 CET 2010
+#Wed Jan 19 09:55:04 CET 2011
 app.build.display.info=0
 app.grails.version=1.3.6
@@ -6 +6 @@
 app.servlet.version=2.4
 app.version=0.1
+plugins.db-util=0.4
 plugins.famfamfam=1.0.1
-plugins.db-util=0.4
 plugins.hibernate=1.3.6
+plugins.jquery=1.4.4.1
+plugins.jquery-ui=1.8.7
 plugins.tomcat=1.3.6
-plugins.jquery=1.4.4
-plugins.jquery-ui=1.8.7

trunk/grails-app/conf/BaseFilters.groovy

@@ -100 +100 @@
                         before = {
                                 // Never perform full synchronization on rest call when the synchronize controller is used
-                                if( controllerName == "rest" || controllerName == "synchronize" ) {
+                                if( controllerName == "rest" || controllerName == "synchronize" || controllerName == "dbUtil" ) {
                                         return true;
                                 }

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

@@ -120 +120 @@
          * @return ArrayList 
          */
-        public ArrayList getAssays(String sessionToken, String studyToken) {
+        public ArrayList getAssays(String sessionToken, String studyToken) throws NotAuthorizedException, ResourceNotFoundException {
                 try {
                         return this.callGSCF(sessionToken, "getAssays", ["studyToken": studyToken])
@@ -139 +139 @@
          * @return ArrayList 
          */     
-        public def getAssay(String sessionToken, String studyToken, String assayToken ) {
+        public def getAssay(String sessionToken, String studyToken, String assayToken ) throws NotAuthorizedException, ResourceNotFoundException {
                 def list
                 try {
@@ -165 +165 @@
          * @return ArrayList 
          */
-        public ArrayList getSamples(String sessionToken, String assayToken) {
+        public ArrayList getSamples(String sessionToken, String assayToken) throws NotAuthorizedException, ResourceNotFoundException {
                 // Samples of a Study limited to a single Assay
                 try {
@@ -186 +186 @@
          * @return ArrayList 
          */
-        public def getSample(String sessionToken, String assayToken, String sampleToken) {
+        public def getSample(String sessionToken, String assayToken, String sampleToken) throws NotAuthorizedException, ResourceNotFoundException {
                 def list
 
@@ -262 +262 @@
                         if( parameter.value instanceof Collection ) {
                                 parameter.value.each { value ->
-                                        addr += "&${parameter.key}=${value}" 
+                                        addr += "&${parameter.key}=" + value.toString().encodeAsURL()
                                 }
                         } else {
-                                addr += "&${parameter.key}=${parameter.value}"
+                                addr += "&${parameter.key}=" + parameter.value.toString().encodeAsURL()
                         } 
                 }

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

@@ -103 +103 @@
                 def studies
                 if( eager ) {
-                        studies = Study.list().findAll { !it.trashcan };
-                        log.trace "Eager synchronization: " + studies.size();
+                        studies = []
+                        log.trace "Eager synchronization";
                 } else {
                         studies = Study.findAllWhere( [isDirty: true] );
                         log.trace "Default synchronization: " + studies.size()
+
+                        // Perform no synchronization if no studies have to be synchronized
+                        if( studies.size() == 0 )
+                                return []
                 }
                 
-                // Perform no synchronization if no studies have to be synchronized
                 // Perform synchronization on only one study directly, because otherwise
                 // the getStudies method could throw a ResourceNotFoundException or NotAuthorizedException
                 // that can better be handled by synchronizeStudy
-                if( studies.size() == 0 ) {
-                        return []
-                } else if( studies.size() == 1 ) {
-                        println "Study: " + studies[ 0]
+                if( studies.size() == 1 ) {
                         def newStudy = synchronizeStudy( studies[0] );
                         if( newStudy )

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

@@ -22 +22 @@
                                   url: "<g:createLink controller="synchronize" action="perform" />",
                                   success: function(data) { window.location.replace( "${url.encodeAsJavaScript()}" ); },
-                                  error: function(xhr, textStatus, errorThrown) { alert( "Error " + xhr.responseCode + ": " + textStatus ); window.location.replace( "${url.encodeAsJavaScript()}" ); }
+                                  error: function(xhr, textStatus, errorThrown) { 
+                                        if( confirm( "Error " + xhr.responseCode + ": " + xhr.responseText + ". Would you like to try again?" ) ) {
+                                                window.location.refresh();
+                                        } else {
+                                                if( confirm( "Would you like to continue to the original page?") ) {
+                                                        window.location.replace( "${url.encodeAsJavaScript()}" );
+                                                } else {
+                                                        $( "#wait_dialog").dialog( "close" );
+                                                }
+                                        }                                               
+                                  }
                                 });
                         });