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

Timestamp:

Jan 28, 2011, 12:30:39 PM (13 years ago)

Author:

robert@…

Message:

 

File:

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

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

@@ -79 +79 @@
          */
         public void fullSynchronization() {
-                if( !timeForFullSynchronization() )
-                        return
-
                 def previousEager = this.eager
                 this.eager = true
@@ -630 +627 @@
 
                                         // Update the sample object if necessary
-                                        if( sampleFound.name != gscfSample.name ) {
-                                                sampleFound.name = gscfSample.name
-                                                sampleFound.save();
-                                        }
+                                        sampleFound.name = gscfSample.name
+                                        sampleFound.subject = gscfSample.subject
+                                        sampleFound.event = gscfSample.event + ( gscfSample.startTime ? " (" + gscfSample.startTime + ")" : "" )
+                                        sampleFound.save();
                                 } else {
                                         log.trace( "AssaySample not found in assay" )
@@ -644 +641 @@
 
                                                 // Update the sample object if necessary
-                                                if( sampleFound.name != gscfSample.name ) {
-                                                        sampleFound.name = gscfSample.name
-                                                        sampleFound.save();
-                                                }
+                                                sampleFound.name = gscfSample.name
+                                                sampleFound.subject = gscfSample.subject
+                                                sampleFound.event = gscfSample.event + ( gscfSample.startTime ? " (" + gscfSample.startTime + ")" : "" )
+                                                sampleFound.save();
                                         } else {
                                                 log.trace( "Sample " + gscfSample.sampleToken + " not found in database. Creating a new object." )
@@ -653 +650 @@
                                                 // 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 + ")" : "" )
                                                 assay.study.addToSamples( sampleFound );
                                                 sampleFound.save();