Changeset 4445

Timestamp:

19/11/08 11:57:16 (11 years ago)

Author:

cbyrom

Message:

Add code to display the associated deployments info for deployments data
+ store atom details in session variable to allow re-use to improve
load efficiency.

Location:

TI05-delivery/ows_framework/trunk/ows_server/ows_server

Files:

• controllers/editatom.py (modified) (1 diff)
• controllers/retrieve.py (modified) (2 diffs)
• public/js/queueDeployments.js (modified) (1 diff)
• templates/atom_editor.html (modified) (1 diff)
• templates/atom_functions.html (modified) (1 diff)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/editatom.py

@@ -244 +244 @@
         inputs = request.params
         c.atom = Atom(xmlString=str(x), ndgObject = self.ndgObject, **dict(inputs))
+        
+        # save the current atom - to avoid this needing be recreated by the 
+        # asynch viewDeployments call
+        session['currentAtom'] = c.atom
+        session.save()
         logging.info("Data model set up")
 

TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/retrieve.py

@@ -77 +77 @@
             response.status_code = 400
             return render('error')
-            
+
         try:
-            status,x=interface.GetXML(uri,outputSchema=self.outputSchema, useCache=False)
-            c.xmlh=x
-            c.atom = Atom(xmlString=str(x), ndgObject = self.uri)
+            # NB, we should have stored the current atom data - so look this up now
+            atom = session.get('currentAtom')
+            if atom:
+                c.atom = atom
+            else:
+                status,x=interface.GetXML(uri,outputSchema=self.outputSchema, useCache=False)
+                c.xmlh=x
+                c.atom = Atom(xmlString=str(x), ndgObject = self.uri)
+            
+            # NB, there are two routes through here - if we're viewing a data entity,
+            # the deployment links are available directly from the atom; if not we
+            # need to look them up
+            lookupIndirectReferences = False
+            if c.atom.isDeployable():
+                lookupIndirectReferences = True
             
             dr = DocumentRetrieve(self.cf.get('NDG_EXIST','local'),
                       pwfile=self.cf.get('NDG_EXIST','passwordFile'))
-            c.atom.lookupDeploymentsInfo(dr)
+            c.atom.lookupDeploymentsInfo(dr, lookupIndirectReferences = \
+                                         lookupIndirectReferences)
             return render('genshi', 'deployments_data')
         
@@ -154 +167 @@
                                              uri = self.uri)
                 templateType = "genshi"
+                # store the atom for easy re-use by asynch calls
+                # - primarily for the viewDeployments() method here
+                session['currentAtom'] = c.atom
+                session.save()
 
             elif viewFormat == ndgObject.MOLES_DOC_TYPE:

TI05-delivery/ows_framework/trunk/ows_server/ows_server/public/js/queueDeployments.js

@@ -5 +5 @@
 
 var MyApp = {
-    NAME : 'Deployments - loading',
+    NAME : 'Loading deployments info...',
         
     q : new Y.Queue(),

TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/atom_editor.html

@@ -34 +34 @@
                         <div py:if="c.atom.isDE()" py:replace="Associations('Associated Data Granules', c.atom.getLinksOfType(g.vtd.GRANULE_TERM), c.addGranuleLink, c.saveAssoc)"/>
                         <div py:if="c.atom.isDE()" py:replace="Associations('Associated Deployments', c.atom.getLinksOfType(g.vtd.DEPLOYMENT_TERM), c.addDeploymentLink, c.saveAssoc)"/>
+                        <div class="metadataSection" py:if="c.atom.isDeployable()">
+                                <div class="headingblock" id="deploymentsPlaceholder" />
+                            </div>
                                 <span py:if="not c.atom.isDeployment()" py:strip="">
                                         <span py:if="not c.saveLink" py:strip="">

TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/atom_functions.html

@@ -576 +576 @@
                         </table>
                 </form>
-        <div class="headingblock" py:if="c.isDeployment and not editLink" id="deploymentsPlaceholder" />
+        <div class="headingblock" py:if="c.atom.isDE() and c.isDeployment and not editLink" id="deploymentsPlaceholder" />
                 <table py:if="not links"><tr><td>
                         No data specified at present