Changeset 8415 for mauRepo/MolesManager

Timestamp:

27/06/12 10:34:37 (9 years ago)

Author:

mnagni

Message:

Complete - # 22512: Implementation of the new CEDAMoles model
 http://team.ceda.ac.uk/trac/ceda/ticket/22512

Location:

mauRepo/MolesManager/trunk/src

Files:

• MolesManager/static/js/cedaObservation.js (modified) (5 diffs)
• libs/migration/processor/commons.py (modified) (3 diffs)
• libs/migration/processor/dataEntity.py (modified) (1 diff)
• libs/migration/processor/deployment_data.py (modified) (2 diffs)

mauRepo/MolesManager/trunk/src/MolesManager/static/js/cedaObservation.js

@@ -101 +101 @@
                         if (typeof coObs.relatedParty[loopVal].role !='undefined'){
                                 
-                                if (typeof coObs.relatedParty[loopVal].role.name !='undefined' && coObs.relatedParty[loopVal].role.name !=null && coObs.relatedParty[loopVal].party.length > 0){
-                                                //console.log(coObs.relatedParty[loopVal].role.name,loopVal)
+                                if (typeof coObs.relatedParty[loopVal].role !='undefined' && coObs.relatedParty[loopVal].role !=null && coObs.relatedParty[loopVal].party.length > 0){
+                                                //console.log(coObs.relatedParty[loopVal].role,loopVal)
                                         for (loopInner=0; loopInner<coObs.relatedParty[loopVal].party.length; loopInner++){
                                                 var innerDetails = {};
                                                 innerDetails['type'] = coObs.relatedParty[loopVal].party[loopInner].__class__
                                                 
-                                                if (coObs.relatedParty[loopVal].role.name == 'cl_pointofcontact'){
+                                                if (coObs.relatedParty[loopVal].role == 'pointofcontact'){
                                                         try{
                                                                 innerDetails['helpEmail'] = coObs.relatedParty[loopVal].party[loopInner].contactInfo[0].address.electronicMailAddress[0];
@@ -118 +118 @@
                                                 details[coObs.relatedParty[loopVal].party[loopInner].name] = innerDetails 
                         
-                                                relatedPartyDict[coObs.relatedParty[loopVal].role.name] = details;//names;
+                                                relatedPartyDict[coObs.relatedParty[loopVal].role] = details;//names;
                                         }
                                 }
@@ -147 +147 @@
         function createCitation(coObs,ids,rps,pubDetails,guid){
                 var citationString ='';
-                authName = Object.keys(rps['cl_author'])[0]
-                citationString += '<p>' + citeNameArrange(authName,rps['cl_author'][authName].type);
-                if (rps.hasOwnProperty('cl_coinvestigator')){
+                authName = Object.keys(rps['author'])[0]
+                citationString += '<p>' + citeNameArrange(authName,rps['author'][authName].type);
+                if (rps.hasOwnProperty('coinvestigator')){
                         var orgCoauth = '';
                         var indCoauth = '';
 
-                        for (loopVal=0; loopVal<Object.keys(rps['cl_coinvestigator']).length; loopVal++){ 
+                        for (loopVal=0; loopVal<Object.keys(rps['coinvestigator']).length; loopVal++){ 
                                 
-                                var coInvName = Object.keys(rps['cl_coinvestigator'])[loopVal];
+                                var coInvName = Object.keys(rps['coinvestigator'])[loopVal];
                                 // console.log(coInvName)
-                                // console.log(rps['cl_coinvestigator'][coInvName])
-                                // console.log(rps['cl_coinvestigator'][coInvName].type)
-                                if (rps['cl_coinvestigator'][coInvName].type == 'CI_Organisation'){
-                                        orgCoauth += '; ' + citeNameArrange(coInvName,rps['cl_coinvestigator'][coInvName].type);
+                                // console.log(rps['coinvestigator'][coInvName])
+                                // console.log(rps['coinvestigator'][coInvName].type)
+                                if (rps['coinvestigator'][coInvName].type == 'CI_Organisation'){
+                                        orgCoauth += '; ' + citeNameArrange(coInvName,rps['coinvestigator'][coInvName].type);
                                 }
                                 else {
                                         
-                                        indCoauth +='; ' + citeNameArrange(coInvName,rps['cl_coinvestigator'][coInvName].type);
+                                        indCoauth +='; ' + citeNameArrange(coInvName,rps['coinvestigator'][coInvName].type);
                                 }
                         }
@@ -179 +179 @@
                 }
                 
-                if (rps.hasOwnProperty('cl_publisher')){ 
-                        citationString += ' ' + Object.keys(rps['cl_publisher'])[0] +'.';
+                if (rps.hasOwnProperty('publisher')){ 
+                        citationString += ' ' + Object.keys(rps['publisher'])[0] +'.';
                 }
                 else {
@@ -385 +385 @@
                                         var access_id  = new dojo.html.set(dojo.byId("access_id"),accessLink(coObs.permission));
                                         
-                                        var help_id  = new dojo.html.set(dojo.byId("help_id"),rps['cl_pointofcontact'][Object.keys(rps['cl_pointofcontact'])[0]].helpString);
+                                        var help_id  = new dojo.html.set(dojo.byId("help_id"),rps['pointofcontact'][Object.keys(rps['pointofcontact'])[0]].helpString);
                                         
                                         drawMap(coObs.geographicExtent,'map',ids);

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

@@ -456 +456 @@
     return _returnNotNoneText(title)
 
-def extractSummary(deploymentMigration, dataEntityMigration):
-    resourceXML = getAtomDocumentByMO(deploymentMigration)
+def extractSummary(migrationObject):
+    resourceXML = getAtomDocumentByMO(migrationObject)
     summary = resourceXML.find('%ssummary' % (atomNS))
     return _returnNotNoneText(summary)
@@ -738 +738 @@
     return ci_date
 
-def createCI_Citation(title, date = None, citedResponsibleParty = None):
+def createCI_Citation(title, date = None, icitedResponsibleParty = None):
     """
         Creates a new CI_Citation
         @param title: the CI_Citation title
         @param date: an array of CI_Date instances
-        @param citedResponsibleParty: a list of CI_ResponsibleParty instances
+        @param icitedResponsibleParty: a list of CI_ResponsibleParty instances
     """    
     ci_citation = CI_Citation()
@@ -749 +749 @@
     if date and type(date) == list:
         ci_citation.date.extend(date)
-    if citedResponsibleParty:
-        ci_citation.extend(citedResponsibleParty)
+    if icitedResponsibleParty:
+        ci_citation.citedResponsibleParty.extend(icitedResponsibleParty)
     return ci_citation
 

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

@@ -109 +109 @@
             if doc_date:
                 i_date = createDate(isoDateTimeStringToTimeDate(doc_date))           
-                ci_dates.append(createCI_Date(CI_DateTypeCode.cl_publication, date = i_date))
+                ci_dates.append(createCI_Date(getCLValue(CI_DateTypeCode.cl_publication), date = i_date))
 
             doc_date = findUpdatedDate(self._dataEntityMigration)            
             if doc_date:
                 i_date = createDate(isoDateTimeStringToTimeDate(doc_date))                
-                ci_dates.append(createCI_Date(CI_DateTypeCode.cl_revision, date = i_date))
+                ci_dates.append(createCI_Date(getCLValue(CI_DateTypeCode.cl_revision), date = i_date))
                 
             i_citation = createCI_Citation(title = 'ceda_moles2_citation', date=ci_dates)

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

@@ -36 +36 @@
     createMO_OnlineResource, findLinksInDeployment
 from ea_model.moles3_4.utilities.ceda_publicationstatevalue import CEDA_PublicationStateValue
+from MolesManager.codelist import getCLValue
 
 class DeploymentDataProcessor(object):
@@ -64 +65 @@
                     i_documentation = createCI_Citation("Documentation resource")
                     i_resource = createMO_OnlineResource(doc_link[0]['href'])
-                project = createCEDA_Project(abstract=i_abstract, publication_state=CEDA_PublicationStateValue.cl_working, \
+                project = createCEDA_Project(abstract=i_abstract, publication_state=getCLValue(CEDA_PublicationStateValue.cl_working), \
                                              documentation=i_documentation, project_resource=i_resource)
                 self._commitDeploymentMigration(project, activity, 'ceda_project_id')