Changeset 8274 for mauRepo/MolesManager

Timestamp:

20/04/12 15:24:50 (9 years ago)

Author:

mnagni

Message:

Complete - # 22386: CEDA Observation - title
 http://team.ceda.ac.uk/trac/ceda/ticket/22386

Location:

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

Files:

• dataEntity.py (modified) (1 diff)
• deployment.py (modified) (4 diffs)

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

@@ -110 +110 @@
         ceda_guid.ceda_observationcollection = ceda_observationCollection.id
         Moles3EPB.addCedaObject(ceda_guid, self.migrationSessions.molesSession, True)
-        DataEntityProcessor.log.info("GUI for this ObservationCollection: %s" % (ceda_guid.id))
+        DataEntityProcessor.log.info("GUID for this ObservationCollection: %s" % (ceda_guid.id))
         
         return ceda_observationCollection

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

@@ -113 +113 @@
             for np in newResponsiblePartyInfo.party:
                 opi.party.append(np)
-
-    def _appendResponsibleParty(self, observation, names, creation_function, role):
-        for nm in names:
-            i_party = creation_function(name = nm)
-            observation.relatedParty.append(createMO_ResponsiblePartyInfo(role, [i_party]))        
+       
 
     def _assignName(self, observation):        
@@ -131 +127 @@
 
         i_party = createMO_Organization(name = CEDA)
-        observation.relatedParty.append(createMO_ResponsiblePartyInfo(MO_RoleValue.cl_curator, [i_party]))                               
-        
+        observation.relatedParty.append(createMO_ResponsiblePartyInfo(MO_RoleValue.cl_curator, [i_party]))  
+                
+        ind_names = []
+        org_names = []
         if authors.has_key(doc_authors['authors']):
             tmp_auth = authors[doc_authors['authors']]
             ret = self._extractIndividualsAndOrganizations(tmp_auth, whereAreAuthors)
+
             if len(ret['ind']) > 0:
-                self._appendResponsibleParty(observation, ret['ind'], createCI_Individual, MO_RoleValue.cl_author)                
+                i_party = createCI_Individual(name = ret['ind'][0])
+                observation.relatedParty.append(createMO_ResponsiblePartyInfo(MO_RoleValue.cl_author, [i_party]))                 
             if len(ret['org']) > 0:
-                self._appendResponsibleParty(observation, ret['org'], createMO_Organization, MO_RoleValue.cl_author)                                
-            if len(ret['co_ind']) > 0:
-                self._appendResponsibleParty(observation, ret['co_ind'], createCI_Individual, MO_RoleValue.cl_coinvestigator)                
-            if len(ret['co_org']) > 0:
-                self._appendResponsibleParty(observation, ret['co_org'], createMO_Organization, MO_RoleValue.cl_coinvestigator)                                                                                         
+                i_party = createMO_Organization(name = ret['org'][0])
+                observation.relatedParty.append(createMO_ResponsiblePartyInfo(MO_RoleValue.cl_author, [i_party]))
+            
+            if len(ret['ind']) > 1:
+                ind_names.extend(ret['ind'][1:])                                                                        
+            if len(ret['org']) > 1:
+                org_names.extend(ret['org'][1:])
+            if len(ret['co_ind']) > 1:                                
+                ind_names.extend(ret['co_ind'])
+            if len(ret['co_org']) > 1:                                
+                org_names.extend(ret['co_org'])                    
+                        
         else:
             raise NoAssociatedAuthor(doc_authors['authors'], migrationObject = whereAreAuthors)
@@ -149 +156 @@
         if doc_authors['contributors'] is None:
             return
-        
+                      
         if authors.has_key(doc_authors['contributors']):
             tmp_auth = authors[doc_authors['contributors']]            
             ret = self._extractIndividualsAndOrganizations(tmp_auth, whereAreAuthors)
-            if len(ret['ind']) > 0:
-                self._appendResponsibleParty(observation, ret['ind'], createCI_Individual, MO_RoleValue.cl_coinvestigator)
-            if len(ret['org']) > 0:
-                self._appendResponsibleParty(observation, ret['org'], createMO_Organization, MO_RoleValue.cl_coinvestigator)                
-            if len(ret['co_ind']) > 0:
-                self._appendResponsibleParty(observation, ret['co_ind'], createCI_Individual, MO_RoleValue.cl_coinvestigator)                
-            if len(ret['co_org']) > 0:
-                self._appendResponsibleParty(observation, ret['co_org'], createMO_Organization, MO_RoleValue.cl_coinvestigator)                                                        
-        else:
-            raise NoAssociatedAuthor(doc_authors['contributors'], migrationObject = whereAreAuthors)
-
+            ind_names.extend(ret['ind'])
+            ind_names.extend(ret['co_ind'])
+            org_names.extend(ret['org'])
+            org_names.extend(ret['co_org'])
+            
+        i_party = []
+        for nm in ind_names:
+            i_party.append(createCI_Individual(name = nm))
+        if i_party:
+            observation.relatedParty.append(createMO_ResponsiblePartyInfo(MO_RoleValue.cl_coinvestigator, [i_party]))   
+        
+        del i_party[:]
+        for nm in org_names:
+            i_party.append(createMO_Organization(name = nm))
+        if i_party:
+            observation.relatedParty.append(createMO_ResponsiblePartyInfo(MO_RoleValue.cl_coinvestigator, [i_party]))
 
     def _extractIndividualsAndOrganizations(self, tmp_auth, whereAreAuthors):
@@ -169 +181 @@
             raise Exception("migrationObject is None")
         try:
+            if tmp_auth['author'] == 'unknown':
+                doc_authors = findAuthorsInResource(self._dataEntityMigration)
+                tmp_auth = authors[doc_authors['authors']]
+            
             ret = {'ind': [], 'org': [], 'co_ind': [], 'co_org': []}
             if tmp_auth['type'] == 'ind':
                 ret['ind'].append(tmp_auth['author'])
             elif tmp_auth['type'] == 'org':
-                ret['org'].append(tmp_auth['author'])
-            
+                ret['org'].append(tmp_auth['author'])            
+                
             if tmp_auth['author'] == 'unknown':
                 DeploymentProcessor.log.debug("%s %s %s has unknown author" \
                                              % (whereAreAuthors.doc_status, whereAreAuthors.doc_owner, whereAreAuthors.doc_name))        
+
+            for item in tmp_auth['co_author_type']:           
+                if (tmp_auth['co_author'][tmp_auth['co_author_type'].index(item)] == 'unknown'):
+                    doc_authors = findAuthorsInResource(self._dataEntityMigration)
+                    tmp_auth = authors[doc_authors['contributors']]
+                    break
                   
             for item in tmp_auth['co_author_type']:
                 if item == 'ind':
-                    ret['ind'].append(tmp_auth['co_author'][tmp_auth['co_author_type'].index(item)])
+                    ret['co_ind'].append(tmp_auth['co_author'][tmp_auth['co_author_type'].index(item)])
                 elif item == 'org':
-                    ret['org'].append(tmp_auth['co_author'][tmp_auth['co_author_type'].index(item)])
+                    ret['co_org'].append(tmp_auth['co_author'][tmp_auth['co_author_type'].index(item)])
             
                 if (tmp_auth['co_author'][tmp_auth['co_author_type'].index(item)] == 'unknown'):