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

Timestamp:

Jan 19, 2011, 2:19:10 PM (13 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

File:

• trunk/grails-app/services/nl/tno/metagenomics/integration/SynchronizationService.groovy (modified) (1 diff)

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 )