Changeset 8391 for mauRepo/MolesManager

Timestamp:

25/06/12 08:53:15 (9 years ago)

Author:

mnagni

Message:

Complete - # 22486: CEDA Observation Collection - Title
 http://team.ceda.ac.uk/trac/ceda/ticket/22486

Location:

mauRepo/MolesManager/trunk/src/libs/migration

Files:

• processor/dataEntity.py (modified) (4 diffs)
• tests/migrationprocess.py (modified) (2 diffs)

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

@@ -40 +40 @@
     isoDateTimeStringToTimeDate, findUpdatedDate, createDate,\
     calculateHash, findDOIInMigrationDocument,\
-    hasMOBeenProcessed, getAtomDocumentHashByMO
+    hasMOBeenProcessed, getAtomDocumentHashByMO, extractTitle
 from libs.migration.processor.deployment import DeploymentProcessor
 from ea_model.moles3_4.utilities.mo_publicationstatevalue import MO_PublicationStateValue
@@ -47 +47 @@
 from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_datetypecode import CI_DateTypeCode
 from MolesManager.ceda_guid import CedaGUID
+
+CEDA_TITLE = 'ceda_title'
 
 class DataEntityProcessor(object):
@@ -67 +69 @@
         self.epbRepo = epbRepo
     
+    def _processTitle(self, ceda_observationCollection):
+        ititle = extractTitle(self._dataEntityMigration)
+        if ceda_observationCollection.identifier:
+            for ident in ceda_observationCollection.identifier:
+                if ident.authority.title == CEDA_TITLE:
+                    if ident.code != ititle:
+                        ident.code = ititle
+                    else:
+                        return            
+ 
+        #Else create new
+        i_citation = createCI_Citation(title = CEDA_TITLE)
+        newIdentifier = createMD_Identifier(code = ititle, authority=i_citation)
+        ceda_observationCollection.identifier.append(newIdentifier)     
+    
     def _processCitation(self, ceda_observationCollection):
         contentDict = extractContent(self._dataEntityMigration)
@@ -94 +111 @@
             @return: the persisted CEDA_ObservationCollection element 
         """
+        
+        self._processTitle(ceda_observationCollection)
+        
         if not self._dataEntityHasSameHash:
-            self._processCitation(ceda_observationCollection)
+            self._processCitation(ceda_observationCollection)            
             #self._processResult(ceda_observationCollection)
         

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)      
+        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)         
         
         
@@ -90 +90 @@
         
         #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_12458543158227759.atom')                
-        self.processDataEntity(DO_BADC, DS_pUBLISHED, 'dataent_ECMWF-E40.atom')
-        self.processDataEntity(DO_BADC, DS_pUBLISHED, 'dataent_ECMWF-TRJ.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')
+        #self.processDataEntity(DO_BADC, DS_pUBLISHED, 'dataent_ECMWF-TRJ.atom')