Changeset 8264 for mauRepo/MolesManager

Timestamp:

19/04/12 17:10:55 (9 years ago)

Author:

mnagni

Message:

GUID out in the page

Location:

mauRepo/MolesManager/trunk/src

Files:

• MolesManager/moles3epb.py (modified) (1 diff)
• MolesManager/static/templates/base.html (modified) (1 diff)
• MolesManager/views/cedaObservationView.py (modified) (1 diff)
• libs/migration/processor/dataEntity.py (modified) (1 diff)

mauRepo/MolesManager/trunk/src/MolesManager/moles3epb.py

@@ -85 +85 @@
         #Moles3EPB._closeSession(session) 
 
+    @classmethod
+    def retrieveGUIDFromInstance(self, instance, session = None):
+        """
+            Returns the CedaGUID object associated with the given instance.
+            @param instance: an instance of CEDA_Observation os CEDA_ObservationCollection  
+        """
+        intSession = Moles3EPB._getSession(session)
+        if instance is None:
+            return None
+        if type(instance) == CEDA_ObservationCollection:
+            return intSession.query(CedaGUID).filter(CedaGUID.ceda_observationcollection==instance.id).first()
+        elif type(instance) == CEDA_Observation:
+            return intSession.query(CedaGUID).filter(CedaGUID.ceda_observation==instance.id).first()
+            
     
     @classmethod

mauRepo/MolesManager/trunk/src/MolesManager/static/templates/base.html

@@ -77 +77 @@
 
                                         <input type="hidden" name="coObs" id="coObs_id" value='{{ coObs }}' />
+                                        <input type="hidden" name="guid" id="guid_id" value='{{ guid }}' />
 
                                         <div

mauRepo/MolesManager/trunk/src/MolesManager/views/cedaObservationView.py

@@ -32 +32 @@
     if record:
         c['coObs'] = mark_safe(DJEncoder().escapeForJSON(DJEncoder().encode(record)))
+        guid = Moles3EPB.retrieveGUIDFromInstance(record, request.moles_session)
+        if guid:
+            c['guid'] = guid.id
+            print c['guid']
         print c['coObs'] 
     

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

@@ -131 +131 @@
             
             deProcessor.assignDOI(ceda_observation, doi)
+            if doi:
+                DataEntityProcessor.log.info("DOI: %s for " % (doi['href'][4:]))
+                DataEntityProcessor.log.info("  -deployment: %s" % (migrationObjectDescription(deploymentMigration)))
+                DataEntityProcessor.log.info("  -dataEntity: %s" % (migrationObjectDescription(self._dataEntityMigration)))
             self.migrationSessions.molesSession.commit()
         except NoAssociatedAuthor as ex: