Changeset 8445 for mauRepo/MolesManager/trunk/src/libs/migration/processor/dataEntity.py

Timestamp:

06/07/12 15:57:19 (9 years ago)

Author:

mnagni

Message:

Complete - # 22489: CEDA Observation Collection - phenomenonTime
 http://team.ceda.ac.uk/trac/ceda/ticket/22489
Complete - # 22488: CEDA Observation Collection - Geographical Extent
 http://team.ceda.ac.uk/trac/ceda/ticket/22488

File:

• mauRepo/MolesManager/trunk/src/libs/migration/processor/dataEntity.py (modified) (4 diffs)

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

@@ -40 +40 @@
     calculateHash, findDOIInMigrationDocument,\
     hasMOBeenProcessed, getAtomDocumentHashByMO, extractTitle, extractSummary,\
-    createEX_GeographicBoundingBox
+    createEX_GeographicBoundingBox, fromDateStringToPhenomenonTime,\
+    comparePhenomenonTimes, compareGeographicBoundingBoxes
 from libs.migration.processor.deployment import DeploymentProcessor
 from logging import StreamHandler
@@ -49 +50 @@
     getCLValue
 from ea_model.ceda_metadatamodel.ceda_observationcollection.ceda_observationcollection import CEDA_ObservationCollection 
+from MolesManager.moles3epb import getUnifyObservationCollectionPhenomenonTime
 CEDA_TITLE = 'ceda_title'
 
@@ -80 +82 @@
             geographicExtent = createEX_GeographicBoundingBox(float(east), float(north), \
                                                               float(west), float(south))
-            if self._dataEntityHasBeenProcessed:
-                DataEntityProcessor.log.warn('The _assignGeographicExtent update is skipped because not implemented')
-                return
-            
-            self.epbRepo.moles3EPB.updateCedaObject(ceda_observationCollection, {'geographicExtent': geographicExtent})                        
+            
+            if len(ceda_observationCollection.geographicExtent) == 0 or \
+                (len(ceda_observationCollection.geographicExtent) > 0 and \
+                    not compareGeographicBoundingBoxes(geographicExtent, \
+                                                  ceda_observationCollection.geographicExtent[0])):
+                self.epbRepo.moles3EPB.updateCedaObject(ceda_observationCollection, \
+                                                        {'geographicExtent': geographicExtent})                        
         else:
             self._report.append(NoGeographicalExtensionException(self._dataEntityMigration))          
         
+    def _assignPhenomenonTime(self, ceda_observationCollection):
+        start, end = getUnifyObservationCollectionPhenomenonTime(ceda_observationCollection)
+        dateString = start
+        if end is not None:
+            dateString = '%s/%s' % (start, end)
+        pt = fromDateStringToPhenomenonTime(dateString)
+        
+        if ceda_observationCollection.phenomenonTime is not None \
+            and (len(ceda_observationCollection.phenomenonTime) == 0 \
+                 or (len(ceda_observationCollection.phenomenonTime) == 1 and \
+                     not comparePhenomenonTimes(ceda_observationCollection.phenomenonTime[0], pt))):
+            self.epbRepo.moles3EPB.updateCedaObject(ceda_observationCollection, {'phenomenonTime': pt})        
 
     def _assignDescription(self, ceda_observationCollection):
@@ -243 +259 @@
             except Exception as ex:
                 self._report.append(ex)                
+                        
         self._assignGeographicExtent(obsColl)
+        self._assignPhenomenonTime(obsColl)        
           
         return self._report