Changeset 8193

Timestamp:

27/03/12 08:33:46 (9 years ago)

Author:

mnagni

Message:

Incomplete - # 22412: CEDA Observation - publisher, curator
 http://team.ceda.ac.uk/trac/ceda/ticket/22412

Location:

mauRepo/MolesManager/trunk/src/libs/migration/processor

Files:

• commons.py (modified) (6 diffs)
• deployment.py (modified) (4 diffs)

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

@@ -38 +38 @@
 from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_onlineresource import CI_OnlineResource
 from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_telephone import CI_Telephone
+from ea_model.iso_19108_2006_temporal_schema.temporal_objects.tm_period import TM_Period
 
 base = '/exist/rest/atoms'
@@ -65 +66 @@
 georssNS="{http://www.georss.org/georss/10}"
 gmlNS="{http://www.opengis.net/gml}"
-time_format = '%Y-%m-%dT%H:%M:%SZ'
+date_format = '%Y-%m-%d'
+datetime_format = date_format + 'T%H:%M:%SZ'
 ihost = 'bora.badc.rl.ac.uk'
 iport = '8080'
@@ -156 +158 @@
         @param timestring: a time string formatted as '%Y-%m-%dT%H:%M:%SZ'
     '''    
-    return datetime.datetime.fromtimestamp(time.mktime(time.strptime(timestring, time_format)))
+    return datetime.datetime.fromtimestamp(time.mktime(time.strptime(timestring, datetime_format)))
+
+def isoDateStringToTimeDate(datestring):
+    '''
+        Return a datatime.datatime instance.
+        @param datestring: a date string formatted as '%Y-%m-%d'
+    '''
+    return datetime.datetime.strptime(datestring, date_format)
 
 def isoDateTimeStringToTimeDate(timestring):
@@ -163 +172 @@
         @param timestring: a time string formatted as '%Y-%m-%dT%H:%M:%SZ'
     '''
-    return datetime.datetime.strptime(timestring, time_format)
+    return datetime.datetime.strptime(timestring, datetime_format)
 
 def _getDocument(source):
@@ -197 +206 @@
     provider_id = resourceXML.find('%sentity/%smolesISO/%sproviderID' % (molesNS, molesNS, molesNS))
     return _returnNotNoneText(provider_id)
+
+def extractMolesTemporalRange(migrationObject):
+    resourceXML = getAtomDocumentByMO(migrationObject)
+    temporal_range = resourceXML.find('%stemporalRange' % (molesNS))
+    return _returnNotNoneText(temporal_range)
 
 def extractMolesCreationDate(migrationObject):
@@ -470 +484 @@
     tm_instant.position = position
     return tm_instant
+
+def createTM_Period(begin, end):
+    '''
+        Creates a new TM_Position instance
+        @param position: a TM_Position instance
+    '''
+    tm_period = TM_Period()
+    tm_period.begin = begin
+    tm_period.end = end    
+    return tm_period
 
 def createCI_Address(deliveryPoint = None, electronicMailAddress = None, city = None, country = None, postalCode = None):

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

@@ -17 +17 @@
     DO_UKSSDC, createMO_ResponsiblePartyInfo_, createMO_Organization,\
     createCI_Contact, createCI_Address, createCI_OnlineResource,\
-    createCI_Telephone
+    createCI_Telephone, extractMolesTemporalRange, isoDateStringToTimeDate,\
+    createTM_Period
 from ea_model.moles3_4.utilities.mo_rolevalue import MO_RoleValue
 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation
@@ -244 +245 @@
 
     def _assignPublisherCurator(self, observation):        
-        '''
-            @param relatedPartyInfos: a MO_ResponsiblePartyInfo list
-            @return True if the documents changed, False otherwise
-        '''
         provider_id = extractMolesProviderID(self._deploymentMigration)
         party = None
@@ -280 +277 @@
             Moles3EPB.addRelatedPartyInfoToObservation(createMO_ResponsiblePartyInfo_(MO_RoleValue.cl_curator, party), observation, self._migrationSessions.molesSession)                                                            
 
+    def _assignPhenomenonTime(self, observation):        
+        doc_phenomenon_time = extractMolesTemporalRange(self._deploymentMigration)
+        
+        if doc_phenomenon_time:
+            if '/' in doc_phenomenon_time:
+                period = doc_phenomenon_time.split('/')
+                begin_date = createDate(isoDateStringToTimeDate(period[0]))
+                begin_position = createTM_Position(date8601 = begin_date)
+                begin_tm_instant = createTM_Instant(begin_position)
+                
+                end_date = createDate(isoDateStringToTimeDate(period[1]))
+                end_position = createTM_Position(date8601 = end_date)
+                end_tm_instant = createTM_Instant(end_position)
+                
+                observation.phenomenonTime = createTM_Period(begin_tm_instant, end_tm_instant)
+            else:
+                observation.phenomenonTime = createTM_Position(date8601 = createDate(isoDateStringToTimeDate(doc_phenomenon_time)))         
+
     def createNewObservation(self):
         ceda_observation = CEDA_Observation()
@@ -293 +308 @@
         self._assignCreationDate(ceda_observation)
         self._assignPublisherCurator(ceda_observation)        
+        self._assignPhenomenonTime(ceda_observation)        
         #self._migrationSessions.molesSession.commit()
         #self._commitMoles3()