Changeset 8362

Timestamp:

20/06/12 11:40:21 (8 years ago)

Author:

mnagni

Message:

Fixes a bug in geographicalExtension migration

Location:

mauRepo/MolesManager/trunk/src/libs/migration

Files:

• processor/deployment.py (modified) (1 diff)
• tests/migrationprocess.py (modified) (3 diffs)

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

@@ -433 +433 @@
         if not ge:
             ge = extractGeographicExtentInMigrationDocument(self._dataEntityMigration)
-        geographicExtent = createEX_GeographicBoundingBox(ge['east'], ge['north'], ge['west'], ge['south'])
-        
-        if not self._deploymentHasBeenProcessed:
-            observation.geographicExtent.append(geographicExtent)
+            if ge:
+                geographicExtent = createEX_GeographicBoundingBox(ge['east'], ge['north'], ge['west'], ge['south'])
+                if not self._deploymentHasBeenProcessed:
+                    observation.geographicExtent.append(geographicExtent)
             return          
         #Still have to update observation.geographicExtent

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

@@ -36 +36 @@
 from libs.migration.processor.loadResources import LoadResources
 from libs.migration.db.classes import MigrationObject
-from libs.migration.processor.commons import DO_BADC, DS_pUBLISHED, DS_PUBLISHED
+from libs.migration.processor.commons import DO_BADC, DS_pUBLISHED, DS_PUBLISHED,\
+    DO_NEODC
 from MolesManager.moles3epb import Moles3EPBFactory
 from libs.migration.processor.migrationProcess import MigrationProcess
@@ -75 +76 @@
             for e in ex:
                 print e
+                
+        self.mp = MigrationProcess(self.epbRepo)
 
-    def testMigrationProcess(self):        
-        mp = MigrationProcess(self.epbRepo)
-
-        dataEntity = MigrationObject()
-        dataEntity.doc_owner = DO_BADC
-                
+    def testMigrationProcess(self):                        
         #dataEntity.doc_status = DS_pUBLISHED
         #dataEntity.doc_name = 'dataent_csip.atom'
@@ -90 +88 @@
         
         #Has 3 DOI
-        dataEntity.doc_status = DS_pUBLISHED
-        dataEntity.doc_name = 'dataent_chobs.atom'        
-                
+        self.processDataEntity(DO_BADC, DS_pUBLISHED, 'dataent_chobs.atom')
         
-        ex = mp.process(dataEntity)
-        #ex = []
-        #ex = mp.process()
+        #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')
+              
+        #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_12458543158227759.atom')                
+        self.processDataEntity(DO_BADC, DS_pUBLISHED, 'dataent_ECMWF-E40.atom')
+        self.processDataEntity(DO_BADC, DS_pUBLISHED, 'dataent_ECMWF-TRJ.atom')                
+
+        
+    def processDataEntity(self, doc_owner, doc_status, doc_name):
+        dataEntity = MigrationObject()
+        dataEntity.doc_owner = doc_owner        
+        dataEntity.doc_status = doc_status
+        dataEntity.doc_name = doc_name
+        ex = self.mp.process(dataEntity)
         for e in ex:
             print e
-        #self._dropAllTables()
+        
 
-    """        
-    def _dropAllTables(self):
-        session = Moles3EPB.getNewMolesSession()
-        f = open('dropAllTables.sql', 'r')
-        for line in f.readlines():
-            stripped = line.strip()
-            if len(stripped) > 0:
-                Moles3EPB.executeNative(line.strip(), session)
-        session.commit()
-        session.close()        
-    """    
-        
-