Changeset 8181

Timestamp:

22/03/12 13:32:38 (8 years ago)

Author:

mnagni

Message:

Incomplete - # 22407: DeploymentDataMigration? bug
 http://team.ceda.ac.uk/trac/ceda/ticket/22407

Location:

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

Files:

• commons.py (modified) (3 diffs)
• deployment_data.py (modified) (4 diffs)

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

@@ -7 +7 @@
 from ea_model.iso_19115_2006_metadata_corrigendum.reference_system_information.md_identifier import MD_Identifier
 from httplib import HTTPConnection
-from xml.etree.ElementTree import XML, ElementTree, fromstring, dump, tostring
+from xml.etree.ElementTree import XML, tostring
 import time, datetime
 from ea_model.upcomingiso.ci_organisation import CI_Organisation
 from ea_model.upcomingiso.ci_party import CI_Party
 from ea_model.upcomingiso.ci_individual import CI_Individual
-from libs.migration.exception.exceptions import NoDataLineage,\
-    NoAssociatedAuthor
+from libs.migration.exception.exceptions import NoDataLineage
 from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_citation import CI_Citation
 from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_element import DQ_Element
@@ -20 +19 @@
 from xml.sax.saxutils import unescape, escape
 import html5lib
-from html5lib import sanitizer, treebuilders
-from libs.migration.authors import authors
+from html5lib import treebuilders
 from ea_model.ceda_metadatamodel.ceda_result.ceda_result import CEDA_Result
 from ea_model.moles3_4.result.mo_onlineresource import MO_OnlineResource
 from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.url import URL
-from ea_model.iso_19115_2006_metadata_corrigendum.extent_information.ex_geographicextent import EX_GeographicExtent
 from ea_model.iso_19115_2006_metadata_corrigendum.extent_information.ex_geographicboundingbox import EX_GeographicBoundingBox
-from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_onlinefunctioncode import CI_OnLineFunctionCode
+from ea_model.ceda_metadatamodel.ceda_computation.ceda_processing import CEDA_Processing
+from ea_model.ceda_metadatamodel.ceda_acquisition.ceda_instrument import CEDA_Instrument
+from ea_model.ceda_metadatamodel.ceda_observationprocess.ceda_compositeprocess import CEDA_CompositeProcess
+from ea_model.ceda_metadatamodel.ceda_acquisition.ceda_acquisition import CEDA_Acquisition
 
 base = '/exist/rest/atoms'
@@ -496 +496 @@
     return ex_geographic_bb
     
-
-
-
-
+def createCEDA_Processing():
+    ceda_processing = CEDA_Processing()
+    return ceda_processing
+
+
+def createCEDA_Instrument():
+    ceda_instrument = CEDA_Instrument()
+    return ceda_instrument
+
+def createCEDA_CompositeProcess():
+    ceda_cp = CEDA_CompositeProcess()
+    return ceda_cp
+
+def createCEDA_Acquisition():
+    ceda_acquisition = CEDA_Acquisition()
+    return ceda_acquisition
+    

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

@@ -5 +5 @@
 '''
 from libs.migration.processor.commons import findLinksInDeployment,\
-    findSubTypeInDPT, hasAtomDocumentSameHash, getAtomDocumentHashByMO
+    findSubTypeInDPT, hasAtomDocumentSameHash, getAtomDocumentHashByMO,\
+    createCEDA_Processing, createCEDA_Instrument
 from libs.migration.MigrationEPB import MigrationEPB
-from ea_model.ceda_metadatamodel.ceda_computation.ceda_processing import CEDA_Processing
-from ea_model.ceda_metadatamodel.ceda_acquisition.ceda_instrument import CEDA_Instrument
-from ea_model.ceda_metadatamodel.ceda_observationprocess.ceda_compositeprocess import CEDA_CompositeProcess
-from ea_model.ceda_metadatamodel.ceda_acquisition.ceda_acquisition import CEDA_Acquisition
-from libs.epb import EPB
 from MolesManager.moles3epb import Moles3EPB
 
@@ -20 +16 @@
         self._deploymentMigration = deploymentMigration
         
-    def _processCEDA_Processing(self, dataProductionTool):
-        if dataProductionTool and hasattr(dataProductionTool, 'ceda_processing_id'):
-            return EPB.searchOrCreate(CEDA_Processing, self._migrationSessions.molesSession, dataProductionTool.ceda_processing_id)
-
-    def _processCEDA_Instrument(self, dataProductionTool):
-        if dataProductionTool and hasattr(dataProductionTool, 'ceda_instrument_id'):        
-            return EPB.searchOrCreate(CEDA_Instrument, self._migrationSessions.molesSession, dataProductionTool.ceda_instrument_id)
-    
-    def _processCEDA_CompositeProcess(self, observationStation):
-        if observationStation and hasattr(observationStation, 'ceda_compositeprocess_id'):        
-            return EPB.searchOrCreate(CEDA_CompositeProcess, self._migrationSessions.molesSession, observationStation.ceda_compositeprocess_id)        
-
-    def _processCEDA_Acquisition(self, observationStation):
-        if observationStation and hasattr(observationStation, 'ceda_acquisition_id'):        
-            return EPB.searchOrCreate(CEDA_Acquisition, self._migrationSessions.molesSession, observationStation.ceda_acquisition_id)        
+    def _commitDeploymentMigration(self, associateWithCedaObservation, dataProductionTool, dataProductionToolField):
+        Moles3EPB.addCedaObject(associateWithCedaObservation, self._migrationSessions.molesSession, True)
+        setattr(dataProductionTool, dataProductionToolField, associateWithCedaObservation.id)                                  
+        self._migrationSessions.migrationSession.commit() 
         
     def _assignProcess(self):
@@ -53 +38 @@
             subType = findSubTypeInDPT(dataProductionTool)
             if subType == 'model':
-                ret = self._processCEDA_Processing(dataProductionTool)
-                Moles3EPB.addCedaObject(ret, self._migrationSessions.molesSession, True)
-                dataProductionTool.ceda_processing_id = ret.id
-                self._migrationSessions.migrationSession.commit()               
+                associateWithCedaObservation = createCEDA_Processing()
+                self._commitDeploymentMigration(associateWithCedaObservation, dataProductionTool, 'ceda_processing_id')
                 if not (hasCedaComposite or hasCedaProcessing):
-                    associateWithCedaObservation = ret
                     hasCedaProcessing = True
                     hasCedaComposite = False
                     hasCedaAcquisition = False 
             else:
-                ret = self._processCEDA_Instrument(dataProductionTool)
-                Moles3EPB.addCedaObject(ret, self._migrationSessions.molesSession, True)
-                dataProductionTool.ceda_instrument_id = ret.id 
-                self._migrationSessions.migrationSession.commit()  
+                associateWithCedaObservation = createCEDA_Instrument()
+                self._commitDeploymentMigration(associateWithCedaObservation, dataProductionTool, 'ceda_instrument_id')
                 
                 
@@ -81 +61 @@
             subType = findSubTypeInDPT(observationStation)
             if subType == 'satellite':
-                ret = self._processCEDA_CompositeProcess(observationStation)
-                Moles3EPB.addCedaObject(ret, self._migrationSessions.molesSession, True)                
-                observationStation.ceda_compositeprocess_id = ret.id 
-                self._migrationSessions.migrationSession.commit()                                
-                if not hasCedaComposite:
-                    associateWithCedaObservation = ret
-                    hasCedaProcessing = True
-                    hasCedaComposite = False
-                    hasCedaAcquisition = False                    
+                    associateWithCedaObservation = createCEDA_Processing()
+                    self._commitDeploymentMigration(associateWithCedaObservation, dataProductionTool, 'ceda_compositeprocess_id')   
+                    if not hasCedaComposite:
+                        hasCedaProcessing = True
+                        hasCedaComposite = False
+                        hasCedaAcquisition = False               
             else:
-                ret = self._processCEDA_Acquisition(observationStation)
-                Moles3EPB.addCedaObject(ret, self._migrationSessions.molesSession, True)
-                observationStation.ceda_acquisition_id = ret.id 
-                self._migrationSessions.migrationSession.commit()                
+                pass
+                '''
+                associateWithCedaObservation = createCEDA_Acquisition()
+                self._commitDeploymentMigration(associateWithCedaObservation, dataProductionTool, 'ceda_acquisition_id')
+                '''                
                 if not (hasCedaComposite or hasCedaProcessing or hasCedaAcquisition):
-                    associateWithCedaObservation = ret
                     hasCedaProcessing = True
                     hasCedaComposite = False
                     hasCedaAcquisition = True
+                    
         
         return associateWithCedaObservation