Changeset 8201

Timestamp:

01/04/12 11:04:34 (9 years ago)

Author:

mnagni

Message:

Complete - # 22390: AMEND MOLES2 -> CEDA Moles Author and Co-author migration (plus PI assignment) to CEDA Observation record
 http://team.ceda.ac.uk/trac/ceda/ticket/22390
Complete - # 22397: CEDA Observation geographicExtent
 http://team.ceda.ac.uk/trac/ceda/ticket/22397

Location:

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

Files:

• commons.py (modified) (1 diff)
• deployment.py (modified) (5 diffs)

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

@@ -582 +582 @@
 def createMO_Organization(name = None, contactInfo = None):
     '''
-        Creates a new MO_Organization instance
+        Creates a new MO_Organization instance.
+        TEMPORARILY RETURNS A CI_ORGANIZATION BECAUSE A DB SCHEMA PROBLEM!!!!
         @param name: a String
         @param contactInfo: an array of CI_Contact        
     '''       
-    ci_party = MO_Organization()
+    ci_party = CI_Organisation()
     if name:
         ci_party.name = name

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

@@ -30 +30 @@
 from libs.migration.authors import authors
 from logging import StreamHandler
-import logging, datetime
+import logging
+from datetime import date
 from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_onlinefunctioncode import CI_OnLineFunctionCode
 from libs.migration.processor.check.check import moles3Append
 from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_datetypecode import CI_DateTypeCode
 from ea_model.iso_19115_2006_metadata_corrigendum.constraint_information.md_restrictioncode import MD_RestrictionCode
+from copy import deepcopy
 
 class DeploymentProcessor(object):
@@ -244 +246 @@
             if doi['href'] == '10.5285/E8F43A51-0198-4323-A926-FE69225D57DD':
                 #dt = createDateTime('21', '11', '04', '01', '07', '25', '35')
-                py_date = datetime.date(2011, 4, 1)
+                py_date = date(2011, 4, 1)
                 dt = createDate(py_date)
                 ci_date = createCI_Date(CI_DateTypeCode.cl_publication, date = dt)
             elif doi['href'] == '10.5285/78114093-E2BD-4601-8AE5-3551E62AEF2B':
                 #dt = createDateTime('21', '11', '11', '29', '11', '37', '11')
-                py_date = datetime.date(2011, 11, 29)                
+                py_date = date(2011, 11, 29)                
                 dt = createDate(py_date)                
                 ci_date = createCI_Date(CI_DateTypeCode.cl_publication, date = dt)
@@ -287 +289 @@
         if party:
             observation.relatedParty.append(createMO_ResponsiblePartyInfo_(MO_RoleValue.cl_publisher, [party]))
-            observation.relatedParty.append(createMO_ResponsiblePartyInfo_(MO_RoleValue.cl_custodian, [party]))
-            observation.relatedParty.append(createMO_ResponsiblePartyInfo_(MO_RoleValue.cl_distributor, [party]))
-            observation.relatedParty.append(createMO_ResponsiblePartyInfo_(MO_RoleValue.cl_pointofcontact, [party]))
-            observation.relatedParty.append(createMO_ResponsiblePartyInfo_(MO_RoleValue.cl_metadataowner, [party]))
-            observation.relatedParty.append(createMO_ResponsiblePartyInfo_(MO_RoleValue.cl_curator, [party]))                                                            
+            observation.relatedParty.append(createMO_ResponsiblePartyInfo_(MO_RoleValue.cl_custodian, deepcopy([party])))
+            observation.relatedParty.append(createMO_ResponsiblePartyInfo_(MO_RoleValue.cl_distributor, deepcopy([party])))
+            observation.relatedParty.append(createMO_ResponsiblePartyInfo_(MO_RoleValue.cl_pointofcontact, deepcopy([party])))
+            observation.relatedParty.append(createMO_ResponsiblePartyInfo_(MO_RoleValue.cl_metadataowner, deepcopy([party])))
+            observation.relatedParty.append(createMO_ResponsiblePartyInfo_(MO_RoleValue.cl_curator, deepcopy([party])))                                                            
 
     def _assignPhenomenonTime(self, observation):        
@@ -313 +315 @@
     def _assignPermission(self, observation):
         access_link = findAccessLinksInMigrationDocument(self._deploymentMigration)
+        dwn_link = findDownloadLinksInMigrationDocument(self._deploymentMigration)
         if len(access_link) == 0:
             access_link = findAccessLinksInMigrationDocument(self._dataEntityMigration) 
@@ -318 +321 @@
         i_accessConstraints = []
         i_use_limitation = []
+        md_legal_constraints = None
         
         if len(access_link) == 0:
-            dwn_link = findDownloadLinksInMigrationDocument(self._deploymentMigration)
-        if len(dwn_link) == 0:
-            dwn_link = findDownloadLinksInMigrationDocument(self._dataEntityMigration)
-            if dwn_link and len(dwn_link) == 1:                
-                i_use_limitation.append("These data are open access and available through %s." % (dwn_link['href']) )
-                #i_accessConstraints.append(MD_RestrictionCode.cl_)
+            if len(dwn_link) == 0:
+                dwn_link = findDownloadLinksInMigrationDocument(self._dataEntityMigration)
+                if dwn_link and len(dwn_link) == 1:                
+                    i_use_limitation.append("These data are open access and available through %s." % (dwn_link[0]['href']) )
+                    #i_accessConstraints.append(MD_RestrictionCode.cl_)
+                    observation.permission = createMD_LegalConstraints(useLimitation = i_use_limitation, accessConstrains = i_accessConstraints)
         else:
             if access_link and len(access_link) == 1:
-                i_use_limitation.append("Access to these data is restricted. To obtain access please apply for access at: %s" % (access_link['href']))
+                i_use_limitation.append("Access to these data is restricted. To obtain access please apply for access at: %s" % (access_link[0]['href']))
                 i_accessConstraints.append(MD_RestrictionCode.cl_restricted)
-                            
-        createMD_LegalConstraints(useLimitation = i_use_limitation, accessConstrains = i_accessConstraints)
-        
+                observation.permission = createMD_LegalConstraints(useLimitation = i_use_limitation, accessConstrains = i_accessConstraints)                
+                                    
         '''                                
         contentDict = extractContent(self._deploymentMigration)