Changeset 8269 for mauRepo/MolesManager

Timestamp:

20/04/12 10:40:54 (9 years ago)

Author:

mnagni

Message:

Complete - # 22434: CEDA Observation - keywords (following Gemini method)
 http://team.ceda.ac.uk/trac/ceda/ticket/22434

Location:

mauRepo/MolesManager/trunk/src/libs/migration

Files:

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

mauRepo/MolesManager/trunk/src/libs/migration/MigrationEPB.py

@@ -54 +54 @@
     def getAllDeploymentsMigrationByDataEntitySortedByDate(self, dataEntity, deploymentNames, session = None):
         intSession = MigrationEPB._getSession(session)
-        return EPB.getAllObjects(DeploymentsMigration, intSession).filter(*[EPB.buildFilter('doc_owner', dataEntity.doc_owner)]).filter(DeploymentsMigration.doc_name.in_(deploymentNames)).order_by(asc("doc_creation"))        
+        return EPB.getAllObjects(DeploymentsMigration, intSession).filter(DeploymentsMigration.doc_name.in_(deploymentNames)).order_by(asc("doc_creation"))        
+        #return EPB.getAllObjects(DeploymentsMigration, intSession).filter(*[EPB.buildFilter('doc_owner', dataEntity.doc_owner)]).filter(DeploymentsMigration.doc_name.in_(deploymentNames)).order_by(asc("doc_creation"))        
         #return EPB.getAllObjects(DeploymentsMigration, intSession).filter(*[EPB.buildFilter('doc_status', dataEntity.doc_status)]).filter(*[EPB.buildFilter('doc_owner', dataEntity.doc_owner)]).filter(DeploymentsMigration.doc_name.in_(deploymentNames)).order_by(asc("doc_creation"))
 
@@ -60 +61 @@
     def _getMigrationObject(self, mo_type, doc_status, doc_owner, doc_name, session = None):
         intSession = MigrationEPB._getSession(session)
-        return intSession.query(mo_type).filter(*[EPB.buildFilter('doc_status', doc_status)]).filter(*[EPB.buildFilter('doc_owner', doc_owner)]).filter(*[EPB.buildFilter('doc_name', doc_name)]).first()
+        return intSession.query(mo_type).filter(*[EPB.buildFilter('doc_name', doc_name)]).first()
+        #return intSession.query(mo_type).filter(*[EPB.buildFilter('doc_owner', doc_owner)]).filter(*[EPB.buildFilter('doc_name', doc_name)]).first()        
+        #return intSession.query(mo_type).filter(*[EPB.buildFilter('doc_status', doc_status)]).filter(*[EPB.buildFilter('doc_owner', doc_owner)]).filter(*[EPB.buildFilter('doc_name', doc_name)]).first()
 
     @classmethod

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

@@ -6 +6 @@
 
 def migrationObjectDescription(migrationObject):
+    if migrationObject is None:
+        raise Exception("Migration object is None")
     try:
         return "%s %s %s" % (migrationObject.doc_status, migrationObject.doc_owner, migrationObject.doc_name)
-    except (Exception, RuntimeError) as ex:
+    except Exception as ex:
         print ex
 

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

@@ -452 +452 @@
             try:
                 linkLongName = link['href'].split('/')[-1]
-                linkName = linkLongName.rsplit('__ATOM__')[1]
+                if '__ATOM__' in linkLongName:
+                    linkName = linkLongName.rsplit('__ATOM__')[1]
+                else:
+                    linkName = linkLongName
                 dpt.append(linkName)
             except Exception as ex:

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

@@ -27 +27 @@
     log = logging.getLogger('DataEntityProcessor')
     log.addHandler(StreamHandler())
-    log.setLevel(logging.DEBUG)  
+    log.setLevel(logging.INFO)  
     '''
         Processes a DataEntityMigration item. Note that each DataEntity is associated to a "dataent_xxxx" file in Moles2
@@ -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))
         
         return ceda_observationCollection
@@ -132 +133 @@
             
             deProcessor.assignDOI(ceda_observation, doi)
-            if doi:
-                DataEntityProcessor.log.info("DOI: %s" % (doi['href'][4:]))
+                
 
             self.migrationSessions.molesSession.commit()

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

@@ -59 +59 @@
     log = logging.getLogger('DeploymentProcessor')
     log.addHandler(StreamHandler())
-    log.setLevel(logging.DEBUG)    
+    log.setLevel(logging.INFO)    
     def __init__(self, dataEntityMigration, deploymentMigration, migrationSessions):
         '''
@@ -176 +176 @@
             
             if tmp_auth['author'] == 'unknown':
-                DeploymentProcessor.log.info("%s %s %s has unknown author" \
+                DeploymentProcessor.log.debug("%s %s %s has unknown author" \
                                              % (whereAreAuthors.doc_status, whereAreAuthors.doc_owner, whereAreAuthors.doc_name))        
                   
@@ -339 +339 @@
             cited_responsible = createCI_ResponsibleParty(role=CI_RoleCode.cl_publisher, \
                                                               organizationName='NERC - British Atmospheric Data Centre')
-            if doi == '10.5285/E8F43A51-0198-4323-A926-FE69225D57DD':
+            if doi.upper() == '10.5285/E8F43A51-0198-4323-A926-FE69225D57DD':
                 py_date = date(2011, 4, 1)
-            elif doi == '10.5285/78114093-E2BD-4601-8AE5-3551E62AEF2B':
+            elif doi.upper() == '10.5285/78114093-E2BD-4601-8AE5-3551E62AEF2B':
                 py_date = date(2011, 11, 29)                
-            elif doi == '10.5285/DB8D8981-1A51-4D6E-81C0-CCED9B921390':
+            elif doi.upper() == '10.5285/DB8D8981-1A51-4D6E-81C0-CCED9B921390':
                 py_date = date(2012, 4, 16)
-            elif doi == '10.5285/639A3714-BC74-46A6-9026-64931F355E07':
+            elif doi.upper() == '10.5285/639A3714-BC74-46A6-9026-64931F355E07':
                 py_date = date(2012, 4, 16)                
                 
@@ -353 +353 @@
                 i_authority = createCI_Citation("DOI", date = ci_date)
                 identifier = createMD_Identifier(code = doi, authority=i_authority)             
-                observation.identifier.append(identifier)                                     
+                observation.identifier.append(identifier)
+                DeploymentProcessor.log.info("DOI: %s" % (doi['href'][4:]))                                  
 
     def _assignPublisherCurator(self, observation):        
@@ -502 +503 @@
         ceda_guid.ceda_observation = ceda_observation.id
         Moles3EPB.addCedaObject(ceda_guid, self._migrationSessions.molesSession, True)
+        DeploymentProcessor.log.info("GUI for this Observation: %s" % (ceda_guid.id))
         
         return ceda_observation