Changeset 8350

Timestamp:

14/06/12 17:25:12 (8 years ago)

Author:

mnagni

Message:

Regression bug. Did not append Observation to ObservationCollection?.member

Location:

mauRepo/MolesManager/trunk/src

Files:

• MolesManager/moles3epb.py (modified) (2 diffs)
• MolesManager/static/templates/cedaSearch.html (modified) (1 diff)
• libs/migration/processor/dataEntity.py (modified) (1 diff)

mauRepo/MolesManager/trunk/src/MolesManager/moles3epb.py

@@ -88 +88 @@
     def updateCedaObject(self, ceda_object, cols_to_update):
         """
-            Update and eventually commit a CEDA Object in MOLES3 db.
-            NOTE: only the returned instance will reflect the update! 
-            @param ceda_object: the CEDA object to persist
-            @param dict: a dictionary containing the columns to update for the given ceda_object
-            @param session: the external session to use. If None a new session will be open to add and commit the object and then closed at the exit. The object is committed
+            Update and eventually commit a CEDA Object in MOLES3 db. 
+            @param ceda_object: the CEDA object to update
+            @param cols_to_update: a dictionary containing the columns to update for the given ceda_object and the desired value.
+            If the attribute is a list of objects the new instances are appended only if do not exist in the actual list 
             @return: the given instance with the updated attributes.
         """
@@ -110 +109 @@
                     coll_k = getattr(coll, k)                        
                     if type(coll_k) == list or type(coll_k) == InstrumentedList:
-                        if  type(val) == list or type(val) == InstrumentedList:
-                            coll_k.extend(val)
+                        tmp_coll = []
+                        if type(val) == list or type(val) == InstrumentedList:
+                            tmp_coll.extend(val)
                         else:
-                            if val in coll_k:
-                                break
-                            coll_k.append(val)
+                            tmp_coll.append(val)
+                        for item in tmp_coll:
+                            if item not in coll_k:
+                                coll_k.append(item)
                     else:
                         setattr(coll, k, val)
-        EPB.persistInstance(coll, self._session)                                 
+        self._session.commit()
+        return coll                                      
 
     def retrieveGUIDFromInstance(self, instance):

mauRepo/MolesManager/trunk/src/MolesManager/static/templates/cedaSearch.html

@@ -23 +23 @@
             <script type="dojo/method" data-dojo-event="onSubmit">
                 if(this.validate()){
-                    return confirm('Form is valid, press OK to submit');
+                    //return confirm('Form is valid, press OK to submit');
                 }else{
                     alert('Form contains invalid data.  Please correct first');

mauRepo/MolesManager/trunk/src/libs/migration/processor/dataEntity.py

@@ -193 +193 @@
             try:
                 ceda_observation = self._processDeploymentMigration(deploymentMigration, howManydm == 1)
-                
-                #Check if a doi has been already assigned     
-                cedaObservationCollection = EPBRepo.moles3EPB.loadAttributes(cedaObservationCollection, 'member')                           
-                member = cedaObservationCollection.member
-                if member and not (ceda_observation in member):
-                    EPBRepo.moles3EPB.updateCedaObject(cedaObservationCollection, {'member': ceda_observation})
+                EPBRepo.moles3EPB.updateCedaObject(cedaObservationCollection, {'member': ceda_observation})
                                       
             except Exception as ex: