Changeset 8210

Timestamp:

03/04/12 08:16:48 (8 years ago)

Author:

mnagni

Message:

Complete - # 22424: CEDA Project - documentation
 http://team.ceda.ac.uk/trac/ceda/ticket/22424

Location:

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

Files:

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

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

@@ -33 +33 @@
 from ea_model.iso_19108_2006_temporal_schema.temporal_reference_system.tm_position import TM_Position
 from ea_model.iso_19108_2006_temporal_schema.temporal_objects.tm_instant import TM_Instant
-from ea_model.moles3_4.utilities.mo_organization import MO_Organization
 from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_contact import CI_Contact
 from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_address import CI_Address
@@ -324 +323 @@
     return linksDict
 
+
+
 def findDownloadLinksInMigrationDocument(migrationObject):
     """
@@ -344 +345 @@
     return linksDict['ACCESS']
 
+def findDocumentationInMigrationDocument(migrationObject):
+    """
+        Return a list of dictionaries describing a <link rel="...DOCUMENT..."> tag type
+        Each dictionary has two keys: 'href' and 'title'
+        @param migrationObject: the migration instance to retrieve and parse
+        @return: a list of dictionaries
+    """
+    linksDict = findLinksInMigrationDocument(migrationObject)
+    return linksDict['DOCUMENT']
+
 def findDOIInMigrationDocument(migrationObject):
     """
@@ -351 +362 @@
         @return: a dictionary relative to the DOI, None otherwise
     """
-    linksDict = findLinksInMigrationDocument(migrationObject)
-    for link in linksDict['DOCUMENTATION']:
+    for link in findDocumentationInMigrationDocument(migrationObject):
         if link['href'].startswith('doi:'):
             return link
@@ -828 +838 @@
     return ceda_acquisition
 
-def createCEDA_Project(abstract = None, publication_state = None):
+def createCEDA_Project(abstract = None, publication_state = None, documentation = None, project_resource=None):
     ceda_project = CEDA_Project()
     if abstract:
@@ -834 +844 @@
     if publication_state:
         ceda_project.publicationState = publication_state        
+    if documentation and type(documentation) == list:
+        ceda_project.documentation = documentation
+    if project_resource and type(project_resource) == list:
+        ceda_project.projectResource = project_resource   
     return ceda_project    

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

@@ -4 +4 @@
 @author: mnagni
 '''
-from libs.migration.processor.commons import findLinksInDeployment,\
-    findSubTypeInDPT, hasAtomDocumentSameHash, getAtomDocumentHashByMO,\
+from libs.migration.processor.commons import findSubTypeInDPT,\
     createCEDA_Processing, createCEDA_Instrument, createCEDA_Project,\
-    findSummary
+    findSummary, findDocumentationInMigrationDocument, createCI_Citation,\
+    createMO_OnlineResource
 from libs.migration.MigrationEPB import MigrationEPB
 from MolesManager.moles3epb import Moles3EPB
@@ -27 +27 @@
         if links.has_key('ACTIVITY'):
             for link in links['ACTIVITY']:
-                activity = MigrationEPB.getDeploymentDataMigrationByName(self._deploymentMigration, link + '.atom', self._migrationSessions.migrationSession)
+                activity = MigrationEPB.getDeploymentDataMigrationByName(self._deploymentMigration, link + '.atom', \
+                                                                         self._migrationSessions.migrationSession)
                 i_abstract = findSummary(activity)
-                project = createCEDA_Project(abstract=i_abstract, publication_state=MO_PublicationStateValue.cl_working)
+                doc_link = findDocumentationInMigrationDocument(activity)
+                i_documentation = None
+                i_resource = None
+                if doc_link and len(doc_link) == 1:
+                    i_documentation = createCI_Citation("Documentation resource")
+                    i_resource = createMO_OnlineResource(doc_link[0]['href'])
+                project = createCEDA_Project(abstract=i_abstract, publication_state=MO_PublicationStateValue.cl_working, \
+                                             documentation=i_documentation, project_resource=i_resource)
                 self._commitDeploymentMigration(project, activity, 'ceda_project_id')
         return project
@@ -39 +47 @@
         hasCedaAcquisition = False
         for dpt in links['DPT']:
-            dataProductionTool = MigrationEPB.getDeploymentDataMigrationByName(self._deploymentMigration, dpt + '.atom', self._migrationSessions.migrationSession)
+            dataProductionTool = MigrationEPB.getDeploymentDataMigrationByName(self._deploymentMigration, dpt + \
+                                                                               '.atom', self._migrationSessions.migrationSession)
             
             #has the document changed?            
@@ -62 +71 @@
         #if not a DPT.subType == 'model' then....
         for obs in links['OBS']:
-            observationStation = MigrationEPB.getDeploymentDataMigrationByName(self._deploymentMigration, obs + '.atom', self._migrationSessions.migrationSession)
+            observationStation = MigrationEPB.getDeploymentDataMigrationByName(self._deploymentMigration, obs + \
+                                                                               '.atom', self._migrationSessions.migrationSession)
  
             #has the document changed?