Changeset 8424 for mauRepo

Timestamp:

02/07/12 15:15:39 (9 years ago)

Author:

mnagni

Message:

Complete - # 22488: CEDA Observation Collection - Geographical Extent
 http://team.ceda.ac.uk/trac/ceda/ticket/22488
Complete - # 22513: Missing ValidTime? tag in the CedaSearch?
 http://team.ceda.ac.uk/trac/ceda/ticket/22513

Location:

mauRepo/MolesManager/trunk/src

Files:

• dropAllTables.sql (modified) (1 diff)
• libs/migration/MigrationEPB.py (modified) (2 diffs)
• libs/migration/processor/commons.py (modified) (2 diffs)
• libs/migration/processor/dataEntity.py (modified) (1 diff)
• libs/migration/processor/deployment.py (modified) (1 diff)
• libs/migration/processor/loadResources.py (modified) (2 diffs)

mauRepo/MolesManager/trunk/src/dropAllTables.sql

@@ -67 +67 @@
 DROP SEQUENCE IF EXISTS nt_junction_id_seq CASCADE;
 DROP TABLE IF EXISTS angle CASCADE;
-DROP TABLE IF EXISTS any CASCADE;
+DROP TABLE IF EXISTS "any" CASCADE;
 DROP TABLE IF EXISTS cc_concatenatedoperation CASCADE;
 DROP TABLE IF EXISTS cc_concatenatedoperation_cc_concatenatedoperation CASCADE;

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

@@ -109 +109 @@
                         setattr(coll, k, val)
         EPB.persistInstance(coll, self._session)                             
-            
-    def loadAttributes(self, instance, attributes):
-        """
-            Returns the attribute of an instance. The parameter "attributes" is a single string or a list of attributes 
-            owned by the instance of "clazz". Furthermore such list may contain 
-            also the children of the main attributes. For example "attrs" may look 
-            like
-            ['resultAccumulation', 'identifier.authority', 'resultTime.position.dateTime8601.month', \
-                      'relatedParty.party', 'result.source.function', 'permission', \
-                      'geographicExtent', 'phenomenonTime', 'keywords', 'description', \
-                      'inSupportOf.abstract', 'dataLineage']
-            the first parameter refers to the main class so is equivalent to 
-            clazz.resultAccumulation
-            the second parameter is equivalent to invoke
-            clazz.identifier.authority
-            As single string "attributes" could be as well just 'identifier.authority'
-            @param instance: an instance containing the appropriate id
-            @param attributes: the attribute value required
-            @param session: the session to use for the operation
-            @return: a detached instance (or array of instances) of the required attribute.                     
-        """
-        instance = self._session.merge(instance)
-        EPB.loadAttributes(instance, attributes)                        
-        return instance  
 
     def search(self, clazz, inst_id):
@@ -139 +115 @@
         ret = EPB.search(clazz, inst_id, self._session)
         return ret 
-         

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

@@ -77 +77 @@
 DS_WORKING = 'working'
 DS_PUBLISHED = 'Published'
-docStatus = (DS_pUBLISHED, DS_WORKING, DS_PUBLISHED)
+DOC_STATUS = (DS_pUBLISHED, DS_WORKING, DS_PUBLISHED)
 
 DT_DEPLOYMENTS = 'deployments'
@@ -83 +83 @@
 DT_DEPLOYMENT_DATA = 'deployment_data'
 DT_DATA_GRANULES = 'data_granules'
-docTypes = (DT_DEPLOYMENTS, DT_DATA_ENTITIES, DT_DEPLOYMENT_DATA, DT_DATA_GRANULES)
+DOC_TYPES = (DT_DEPLOYMENTS, DT_DATA_ENTITIES, DT_DEPLOYMENT_DATA, DT_DATA_GRANULES)
 
 DO_BADC = 'badc.nerc.ac.uk'

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

@@ -47 +47 @@
 from MolesManager.codelist import MM_ObservationPublicationStateValue,\
     getCLValue
-from ea_model.ceda_metadatamodel.ceda_observationcollection.ceda_observationcollection import CEDA_ObservationCollection
-
+from ea_model.ceda_metadatamodel.ceda_observationcollection.ceda_observationcollection import CEDA_ObservationCollection 
 CEDA_TITLE = 'ceda_title'
 

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

@@ -283 +283 @@
         i_category = getCLValue(CEDA_CurationValue.cl_a)                                  
         if infodb_de and infodb_de.has_key('category') and infodb_de['category']:
-            i_category = CEDA_CurationValue.from_string(infodb_de['category'].lower())        
+            i_category = getCLValue(CEDA_CurationValue.from_string(infodb_de['category'].lower()))      
 
         if not self._deploymentHasBeenProcessed:                     

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

@@ -31 +31 @@
 @author: Maurizio Nagni
 '''
-from libs.migration.processor.commons import docStatus, getCollectionRefs,\
+from libs.migration.processor.commons import DOC_STATUS, getCollectionRefs,\
     findMolesCreationDate, findID, stringToTimestamp, buildExistTypePath,\
     buildExistDocPath, DT_DATA_ENTITIES, DT_DEPLOYMENTS, DT_DEPLOYMENT_DATA,\
-    getOwnerRefs, getAtomDocumentAsElementtree, getAtomDocumentHash
+    getOwnerRefs, getAtomDocumentAsElementtree
 from libs.migration.exception.exceptions import NoCreationDate, NoDocumentID
 from libs.migration.db.classes import DeploymentDataMigration,\
@@ -52 +52 @@
         """ 
         ex = []       
-        for status in docStatus:       
+        for status in DOC_STATUS:       
             ex.extend(self._loadCollections(status, DT_DATA_ENTITIES, DataEntityMigration))
             ex.extend(self._loadCollections(status, DT_DEPLOYMENTS, DeploymentsMigration))