Changeset 1911

Timestamp:

Jun 1, 2011, 7:46:30 PM (11 years ago)

Author:

work@…

Message:

• changed delete eventgroup logic and added debugging

Location:

trunk

Files:

• application.properties (modified) (2 diffs)
• grails-app/domain/dbnp/studycapturing/Study.groovy (modified) (6 diffs)

trunk/application.properties

@@ -1 +1 @@
 #Grails Metadata file
-#Mon May 30 14:42:25 CEST 2011
+#Wed Jun 01 19:37:56 CEST 2011
 app.build.display.info=0
 app.build.svn.revision=1079
@@ -15 +15 @@
 plugins.gdt=0.0.54
 plugins.gdtimporter=0.4.5.5
+plugins.grom=0.2.2
 plugins.hibernate=1.3.7
 plugins.jquery=1.6.1.1

trunk/grails-app/domain/dbnp/studycapturing/Study.groovy

@@ -348 +348 @@
          */
         void deleteEventGroup(EventGroup eventGroup) {
+println "deleting eventgroup: ${eventGroup}"
+
                 // If the event group contains sampling events
                 if (eventGroup.samplingEvents) {
+println "got sampling events?"
                         // remove all samples that originate from this eventGroup
                         if (eventGroup.samplingEvents.size()) {
+println "yes"
                                 // find all samples related to this eventGroup
                                 // - subject comparison is relatively straightforward and
@@ -361 +365 @@
                                 //   this seems now to work as expected
                                 // - event group comparison: in progress, doesn't always seem to work but doesn't fail either?
+/*
                                 this.samples.findAll { sample ->
                                         (
+                                                        (
+                                                                (sample.parentEventGroup.id && eventGroup.id && sample.parentEventGroup.id == eventGroup.id)
+                                                                ||
+                                                                (sample.parentEventGroup.getIdentifier() == eventGroup.getIdentifier())
+                                                                ||
+                                                                sample.parentEventGroup.equals(eventGroup)
+                                                        )
+                                                        &&
                                                         (eventGroup.subjects.findAll {
                                                                 it.equals(sample.parentSubject)
@@ -376 +389 @@
                                                                                 )
                                                         })
-                                                        &&
-                                                        eventGroup.equals(sample.parentEventGroup)
                                         )
-                                }.each() { sample ->
+                                }
+*/
+                                // find all samples that
+                                //      - are part of this study
+println "check samples:"
+this.samples.each { sample ->
+        println "sample ${sample}: ${(sample.parentEventGroup.id && eventGroup.id && sample.parentEventGroup.id == eventGroup.id)} - ${(sample.parentEventGroup.getIdentifier() == eventGroup.getIdentifier())} - ${sample.parentEventGroup.equals(eventGroup)}"
+}
+
+println "delete samples:"
+                                this.samples.findAll { sample ->
+                                        (
+                                                // - belong to this eventGroup
+                                                (
+                                                        (sample.parentEventGroup.id && eventGroup.id && sample.parentEventGroup.id == eventGroup.id)
+                                                        ||
+                                                        (sample.parentEventGroup.getIdentifier() == eventGroup.getIdentifier())
+                                                        ||
+                                                        sample.parentEventGroup.equals(eventGroup)
+                                                )
+                                        )
+                                }
+                                .each() { sample ->
                                         // remove sample from study
+println sample
                                         this.deleteSample(sample)
                                 }
@@ -386 +420 @@
 
                         // remove all samplingEvents from this eventGroup
+println "remove sampling events from this eventgroup:"
                         eventGroup.samplingEvents.findAll {}.each() {
+println it
                                 eventGroup.removeFromSamplingEvents(it)
                         }
@@ -392 +428 @@
 
                 // If the event group contains subjects
+println "got subjects?"
                 if (eventGroup.subjects) {
+println "yes, remove subjects from eventgroup:"
                         // remove all subject from this eventGroup
                         eventGroup.subjects.findAll {}.each() {
+println it
                                 eventGroup.removeFromSubjects(it)
                         }
@@ -400 +439 @@
 
                 // remove the eventGroup from the study
+println "remove eventgroup from study"
                 this.removeFromEventGroups(eventGroup)
 
                 // Also here, contrary to documentation, an extra delete() is needed
                 // otherwise cascaded deletes are not properly performed
+println "final delete..."
+println "-----"
                 eventGroup.delete()
         }