Changeset 8387

Timestamp:

21/06/12 17:05:14 (9 years ago)

Author:

mnagni

Message:

CEDA_Observations were not correctly added to CEDA_ObservationCollection.member

Location:

mauRepo/MolesManager/trunk/src

Files:

• MolesManager/moles3epb.py (modified) (1 diff)
• libs/migration/tests/migrationprocess.py (modified) (2 diffs)

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

@@ -167 +167 @@
             @return: True if the collection contains the given observation, False otherwise  
         """
-        ret = self._session.query(CEDA_ObservationCollection, CEDA_Observation).filter(CEDA_ObservationCollection.id==obs_coll_id).filter(CEDA_Observation.id==obs_id).count() > 0
-        return ret
+        coll = self._session.query(CEDA_ObservationCollection).filter(CEDA_ObservationCollection.id==obs_coll_id).first()
+        obs = self._session.query(CEDA_Observation).filter(CEDA_Observation.id==obs_id).first()
+        return obs in coll.member
 
     def observationAuthor(self, obs_id):

mauRepo/MolesManager/trunk/src/libs/migration/tests/migrationprocess.py

@@ -52 +52 @@
     
     def setUp(self):
-        migrationDB = DbManager(MIGRATION_DB_CONNECTION, MIGRATION_DB_SCRIPT, sql_echo=True)
-        #migrationDB = DbManager(MIGRATION_DB_CONNECTION, MIGRATION_DB_SCRIPT)
-        #MigrationEPB.overrrideDBManager(migrationDB)      
+        #migrationDB = DbManager(MIGRATION_DB_CONNECTION, MIGRATION_DB_SCRIPT, sql_echo=True)
+        migrationDB = DbManager(MIGRATION_DB_CONNECTION, MIGRATION_DB_SCRIPT)      
 
-        molesDB = DbManager(MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT, sql_echo=True, session_event_manager=EVENTS_DB)
-        #molesDB = DbManager(MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT, session_event_manager=EVENTS_DB)         
+        #molesDB = DbManager(MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT, sql_echo=True, session_event_manager=EVENTS_DB)
+        molesDB = DbManager(MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT, session_event_manager=EVENTS_DB)         
         
         
@@ -88 +87 @@
         
         #Has 3 DOI
-        #self.processDataEntity(DO_BADC, DS_pUBLISHED, 'dataent_chobs.atom')
+        self.processDataEntity(DO_BADC, DS_pUBLISHED, 'dataent_chobs.atom')
         
         #IASI
-        #self.processDataEntity(DO_NEODC, DS_pUBLISHED, 'dataent_12417810458627666.atom')
-        #self.processDataEntity(DO_BADC, DS_pUBLISHED, 'dataent_VIRTEM.atom')
-        #self.processDataEntity(DO_BADC, DS_pUBLISHED, 'dataent_12162569915925921.atom')
+        self.processDataEntity(DO_NEODC, DS_pUBLISHED, 'dataent_12417810458627666.atom')
+        self.processDataEntity(DO_BADC, DS_pUBLISHED, 'dataent_VIRTEM.atom')
+        self.processDataEntity(DO_BADC, DS_pUBLISHED, 'dataent_12162569915925921.atom')
               
         #ECMWF
-        #self.processDataEntity(DO_BADC, DS_pUBLISHED, 'dataent_ECMWF-ERA.atom')
-        #self.processDataEntity(DO_BADC, DS_pUBLISHED, 'dataent_ECMWF-OP.atom')
+        self.processDataEntity(DO_BADC, DS_pUBLISHED, 'dataent_ECMWF-ERA.atom')
+        self.processDataEntity(DO_BADC, DS_pUBLISHED, 'dataent_ECMWF-OP.atom')
         self.processDataEntity(DO_BADC, DS_pUBLISHED, 'dataent_12458543158227759.atom')                
         self.processDataEntity(DO_BADC, DS_pUBLISHED, 'dataent_ECMWF-E40.atom')