Changeset 8222

Timestamp:

12/04/12 11:42:59 (9 years ago)

Author:

mnagni

Message:

Incomplete - # 22403: CEDA Observation - ceda Internal information
 http://team.ceda.ac.uk/trac/ceda/ticket/22403
Incomplete - # 22428: CEDA Project - observationCollection
 http://team.ceda.ac.uk/trac/ceda/ticket/22428
Complete - # 22397: CEDA Observation geographicExtent
 http://team.ceda.ac.uk/trac/ceda/ticket/22397
Incomplete - # 22385: CEDA Observation - result
 http://team.ceda.ac.uk/trac/ceda/ticket/22385

Location:

mauRepo/MolesManager/trunk/src

Files:

• ea_model/upcomingiso/ci_responsibility.py (modified) (4 diffs)
• libs/commons_db.py (modified) (2 diffs)
• libs/exist_client (deleted)
• libs/migration/InfodbEPB.py (added)
• libs/migration/tests/infodbepbtests.py (added)
• libs/migration/tests/testconfig.py (modified) (1 diff)

mauRepo/MolesManager/trunk/src/ea_model/upcomingiso/ci_responsibility.py

@@ -43 +43 @@
 
         self.extent = []
+        self._party = []
         self._party_ci_individual = []
         self._party_ci_organisation = []
@@ -57 +58 @@
 
     @property
-    def party(self):    
-        ret = []
-        for item in self._party_ci_individual:
-            ret.append(item)
-        for item in self._party_ci_organisation:
-            ret.append(item)
-        return ret
+    def party(self):
+        try:
+            ret = []
+            ret.extend(self._party_ci_individual)
+            ret.extend(self._party_ci_organisation)
+            if not hasattr(self, '_party'):
+                self._party = []
+            self._party[:]
+            self._party.extend(ret)
+        except Exception as e:
+            pass
+        return self._party
 
+    '''
     @party.setter
     def party(self, value):     
@@ -78 +85 @@
                     self._party_ci_organisation.append(item)
                     continue
+    '''
 
     @property
@@ -86 +94 @@
     def role(self, value):      
             self._ci_responsiblepartyinfo.role = value
+
+    def synchronize(self):
+        self._party_ci_individual[:]
+        self._party_ci_organisation[:]
+        for item in self.party:
+            valueClass = "%s.%s" % (type(item).__module__,type(item).__name__)
+            if valueClass == "ea_model.upcomingiso.ci_individual.CI_Individual":
+                self._party_ci_individual.append(item)
+                continue
+            if valueClass == "ea_model.upcomingiso.ci_organisation.CI_Organisation":
+                self._party_ci_organisation.append(item)
+                continue
 
     def __key(self):

mauRepo/MolesManager/trunk/src/libs/commons_db.py

@@ -25 +25 @@
         Represents a database instance managed by an SQLAlchemy engine.        
     """
-    def __init__(self, connection, script):
+    def __init__(self, connection, script = None):
         """
           :param connection: the URL used to open a connection to the database
@@ -34 +34 @@
         self._script = script
         self._engine = create_engine(self._connection, echo=True)
-        if (self._script):
+        self._session = None
+        if self._script:
             self._script(self._metadata)
-            #execfile(self._script, {'metadata': DbManager._metadata, 'engine': self._engine})
             self._metadata.create_all(bind=self._engine)
-        self._session = scoped_session(sessionmaker(bind=self._engine))    
+            self._session = scoped_session(sessionmaker(bind=self._engine))
+            
  
     def createDbSession(self):
         """
-           Returns a brand new Session
+           Returns a brand new connection to the DB.        
+           @return: a sqlalchemy.orm.session.Session instance if the ORM is fully configured, otherwise a sqlalchemy.engine.base.Connection instance 
         """
-        return self._session()
+        if self._session:
+            return self._session()
+        if self._engine:
+            return self._engine.connect()
 
     def closeDbSession(self, dbSession):
         """
-          Commits and closes the given session instance
-          :param dbSession: a Session instance
+          Commits and closes the given session/connection instance
+          :param dbSession: a Session/Connection instance
         """
         try:

mauRepo/MolesManager/trunk/src/libs/migration/tests/testconfig.py

@@ -6 +6 @@
 MIGRATION_DB_CONNECTION = 'postgresql://badc:rotyn217m@neptune.badc.rl.ac.uk:5432/Moles3'
 MOLES3_DB_CONNECTION = 'postgresql://badc:rotyn217m@neptune.badc.rl.ac.uk:5432/Moles3'
+INFO_DB_CONNECTION = 'postgresql://cedainfo:ler239b@bora.badc.rl.ac.uk:5432/cedainfo'
 
 from libs.migration.db.migrationTables import doTables as doMigration