Changeset 8513

Timestamp:

13/08/12 13:03:11 (7 years ago)

Author:

mnagni

Message:

Incomplete - # 22534: Add versiojn number to the gui page
 http://team.ceda.ac.uk/trac/ceda/ticket/22534

Fixes blocking error on classes initialisation and migration

Location:

mauRepo/MolesManager/trunk/cedaMoles

Files:

• MolesManager/moles3epb.py (modified) (1 diff)
• libs/migration/MigrationEPB.py (modified) (1 diff)
• libs/migration/db/classes.py (modified) (3 diffs)

mauRepo/MolesManager/trunk/cedaMoles/MolesManager/moles3epb.py

@@ -206 +206 @@
         """
         bboxes = []
+        if not hasattr(collection, 'member'):
+            return bboxes
         for member in collection.member:
             for ge in member.geographicExtent:

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

@@ -37 +37 @@
 
     def getAllDeploymentsMigrationByDataEntitySortedByDate(self, dataEntity, deploymentNames):
-        return EPB.getAllObjects(DeploymentsMigration, self._session).filter(MigrationObject.doc_name.in_(deploymentNames)).order_by(asc("doc_creation")).all()
+        return EPB.getAllObjects(DeploymentsMigration, self._session).filter(DeploymentsMigration.doc_name.in_(deploymentNames)).order_by(asc("doc_creation")).all()
 
     def _getMigrationObject(self, mo_type, doc_status, doc_owner, doc_name):

mauRepo/MolesManager/trunk/cedaMoles/libs/migration/db/classes.py

@@ -17 +17 @@
         self.data_ent_id = None    
         self.ceda_observation_coll_id = None
-        super(DataEntityMigration, self).__init__(self)
+        super(DataEntityMigration, self).__init__()
 
 class DeploymentsMigration(MigrationObject):
@@ -23 +23 @@
         self.depl_id = None
         self.ceda_observation_id = None        
-        super(DeploymentsMigration, self).__init__(self)
+        super(DeploymentsMigration, self).__init__()
         
 class DeploymentDataMigration(MigrationObject):
@@ -33 +33 @@
         self.ceda_acquisition_id = None
         self.ceda_project_id = None                                
-        super(DeploymentDataMigration, self).__init__(self)           
+        super(DeploymentDataMigration, self).__init__()