Changeset 8258

Timestamp:

19/04/12 11:56:51 (9 years ago)

Author:

mnagni

Message:

 

Location:

mauRepo/MolesManager/trunk/src/libs/migration

Files:

• exception/exceptions.py (modified) (4 diffs)
• processor/commons.py (modified) (1 diff)
• processor/dataEntity.py (modified) (2 diffs)
• processor/deployment.py (modified) (3 diffs)
• processor/migrationProcess.py (modified) (2 diffs)

mauRepo/MolesManager/trunk/src/libs/migration/exception/exceptions.py

@@ -5 +5 @@
 '''
 
-def _migrationObjectDescription(migrationObject):
+def migrationObjectDescription(migrationObject):
     try:
         return "%s %s %s" % (migrationObject.doc_status, migrationObject.doc_owner, migrationObject.doc_name)
@@ -48 +48 @@
         self.comment = comment
     def __str__(self):
-        return "Error on migration object %s " % (_migrationObjectDescription(self.migrationObject))
+        return "Error on migration object %s " % (migrationObjectDescription(self.migrationObject))
 
 class NoAssociatedAuthor(MigrationObjectException):
@@ -58 +58 @@
         super(NoAssociatedAuthor, self).__init__(migrationObject, comment = '')
     def __str__(self):
-        return "The MigrationObject %s has no author mapping for %s" % (_migrationObjectDescription(self.migrationObject), self.author)            
+        return "The MigrationObject %s has no author mapping for %s" % (migrationObjectDescription(self.migrationObject), self.author)            
 
 class NoAssociatedDeployments(Exception):
@@ -71 +71 @@
     def __str__(self):
         if self._deploymentName:
-            return "The DataEntity %s has no associated deployment named %s" % (_migrationObjectDescription(self.migrationObject), self._deploymentName)
+            return "The DataEntity %s has no associated deployment named %s" % (migrationObjectDescription(self.migrationObject), self._deploymentName)
         else:
-            return "The DataEntity %s has no associated deployment" % (_migrationObjectDescription(self.migrationObject))
+            return "The DataEntity %s has no associated deployment" % (migrationObjectDescription(self.migrationObject))
     
 class NoDataLineage(MigrationObjectException):

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

@@ -446 +446 @@
                 dpt.append(linkName)
             except Exception as ex:
-                print ex
+                print "WARN - Cannot extractLinksByMarker %s" % (link)
     return dpt
 

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

@@ -10 +10 @@
 from libs.migration.MigrationEPB import MigrationEPB
 from libs.migration.exception.exceptions import MigrationObjectException, NoAssociatedAuthor,\
-    _migrationObjectDescription, NoAssociatedDeployments
+    migrationObjectDescription, NoAssociatedDeployments
 from libs.migration.processor.commons import findDeploymentsInDE,\
     createMD_Identifier, extractContent, MD_CODE_MOLES2_CITATION,\
@@ -46 +46 @@
         contentDict = extractContent(self._dataEntityMigration)
         if not contentDict.has_key('citation'):
-            DataEntityProcessor.log.info("The migration object "+ _migrationObjectDescription(self._dataEntityMigration) \
+            DataEntityProcessor.log.info("The migration object "+ migrationObjectDescription(self._dataEntityMigration) \
                                          + " has not associated cedacat:citation")
         else:

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

@@ -48 +48 @@
 from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_rolecode import CI_RoleCode
 from ea_model.iso_19115_2006_metadata_corrigendum.maintenance_information.md_maintenancefrequencycode import MD_MaintenanceFrequencyCode
+from ea_model.ceda_metadatamodel.ceda_result.ceda_curationvalue import CEDA_CurationValue
 
 class DeploymentProcessor(object):
@@ -274 +275 @@
                                               self._deploymentMigration.ceda_observation_id)
         return ceda_observation
-
-    def _getcurationcategory(self, curationcategory):
-        """
-            Returns a CEDA_CurationValue code if the parameter match any CEDA_CurationValue code
-            @param curationcategory: a String 
-        """
-        if curationcategory is None:
-            return None
-        
-        for code in ceda_curationvalue.CEDA_CurationValue.__dict__:
-            if code.startswith('cl_'):
-                if code.lower() == curationcategory.lower():
-                    return code
-        return None
         
 
@@ -310 +297 @@
                                                    function = CI_OnLineFunctionCode.cl_download, \
                                                    description = int_description, applicationProfile = int_applicationProfile)
-            dataentity_id = '%s__ATOM__%s' % (self._dataEntityMigration.doc_owner, self._dataEntityMigration.doc_name)
-            dataentity_id = dataentity_id.replace('.atom', '')           
-            infodb_de = InfodbEPB.getCedaInfoApp_dataentityByDE_ID(dataentity_id)
-            i_logical_path = '/dummy'
-            if infodb_de['logical_path']:
-                i_logical_path = infodb_de['logical_path']
-            
-            i_category = ceda_curationvalue.CEDA_CurationValue.cl_a                            
-            if infodb_de['category']:
-                i_category = self._getcurationcategory(infodb_de['category'])
-                
-            observation.result = createCEDA_Result(i_category, i_logical_path, source = [i_source])                                
+            
+        dataentity_id = '%s__ATOM__%s' % (self._dataEntityMigration.doc_owner, self._dataEntityMigration.doc_name)
+        dataentity_id = dataentity_id.replace('.atom', '')           
+        infodb_de = InfodbEPB.getCedaInfoApp_dataentityByDE_ID(dataentity_id)
+        i_logical_path = '/dummy'
+        if infodb_de['logical_path']:
+            i_logical_path = infodb_de['logical_path']
+        
+        i_category = ceda_curationvalue.CEDA_CurationValue.cl_a                            
+        if infodb_de['category']:
+            i_category = CEDA_CurationValue.from_string(infodb_de['category'].lower()) #self._getcurationcategory(infodb_de['category'])                
+        observation.result = createCEDA_Result(i_category, i_logical_path, source = [i_source])                                
 
 

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

@@ -10 +10 @@
 import logging
 from logging import StreamHandler
+from libs.migration.exception.exceptions import migrationObjectDescription
 
 class MigrationProcess():
@@ -45 +46 @@
             
         #loops over the data entities
-        for dataEntityMigration in [f for f in data_ents if f != None]:             
-            dep = DataEntityProcessor(dataEntityMigration, self.migrationSessions)
+        for dataEntityMigration in [f for f in data_ents if f != None]:
+            MigrationProcess.log.info("Start processing dataEntity %s" % (migrationObjectDescription(dataEntityMigration)))             
+            dep = DataEntityProcessor(dataEntityMigration, self.migrationSessions)            
             exs.extend(dep.process())
+            MigrationProcess.log.info("Done")            
         return exs