Changeset 2647

Timestamp:

25/06/07 22:01:52 (14 years ago)

Author:

lawrence

Message:

Interim check in for ows browse, some support for
populating the history and shopping cart tabs.
Some support for granules in browse.

Location:

TI05-delivery/ows_framework/trunk/ows_server/ows_server

Files:

• config/routing.py (modified) (1 diff)
• controllers/retrieve.py (modified) (2 diffs)
• controllers/tabs.py (modified) (2 diffs)
• models/stubB.py (modified) (3 diffs)
• public/layout/ndg2.css (modified) (1 diff)
• templates/ndgPage.kid (modified) (1 diff)
• templates/stubB.kid (modified) (1 diff)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/config/routing.py

@@ -55 +55 @@
     map.connect('discovery',controller='discovery')
     map.connect('updatetab/:value',controller='tabs',action='update')
+    map.connect('addSelection/:uri/:name',controller='tabs',action='addSelection')
+    map.connect('clear/:value',controller='tabs',action='clear')
   
     return map

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

@@ -65 +65 @@
                 c.doc=stubB.stubB(x.tree,self.cf)
                 c.tbinfo=self.__mytb()
+                name=c.doc.abbreviation
             elif self.uri.schema=='NDG-A0':
                 r='csml'
@@ -86 +87 @@
             c.xml='<div class="error">%s</div>'%x
             r='content'
+            
+        if 'ndgSec' in session:
+            #we can update the history
+            if 'history' not in session:
+                session['history']=[(self.uri,name),]
+            else:
+                rb=Utilities.RingBuffer(10)
+                for i in session['history']: rb.append(i)
+                rb.append((uri,name))
+                session['history']=rb.tolist()
+            session.save()
+       
         return render_response(r)
     

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

@@ -1 +1 @@
 from ows_server.lib.base import *
+from ows_server.models import Utilities
 
 class TabsController(BaseController):
@@ -15 +16 @@
         return render_response('cart',fragment=True) 
     
+    def addSelection(self,uri,name):
+        if 'selection' not in session:
+            session['selection']=[(uri,name),]
+        else:
+            rb=Utilities.RingBuffer(10)
+            for i in session['selection']: rb.append(i)
+            rb.append((uri,name))
+            session['selection']=rb.tolist()
+        session.save()
+        return render_response('cart',fragment=True)
+            
+    def clear(self,value):
+        
+        if value=='History':
+            session['history']=[]
+        elif value=='Selection':
+            session['selection']=[]
+        session.save()
+        return render_response('cart',fragment=True)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/stubB.py

@@ -24 +24 @@
         from elementtree import ElementTree as ET
 
-def idconvert(helper,elem,config=None):
+def idconvert(helper,elem,config=None,idelem='dgMetadataID'):
     ''' Given an elementTree element for a dgMetadataID, create
     a standard ndg URI, and produce an ndgObject '''
-    id=helper.find(elem,'dgMetadataID')
+    id=helper.find(elem,idelem)
     entryID='%s__%s__%s'%(helper.getText(id,'repositoryIdentifier'),
                             helper.getText(id,'schemeIdentifier'),
@@ -53 +53 @@
             self.constraints=AccessControl(helper.find(elem,'accessControlPolicy'))
             self.name=name
-            self.uri=idconvert(helper,elem,config)
+            self.uri=idconvert(helper,elem,config,idelem='dataModelID')
             self.entryID=self.uri.uri
 
@@ -96 +96 @@
             i+=1
             #following needs to be refactored when granule definition includes a proper name ...
-            name=wrapGetText(item,'name')
+            name=wrapGetText(item,'dgGranuleSummary/dgGranuleName')
             if name=='': name='Granule %s'%i
             self.granules.append(dataGranule(self.helper,item,self.config,name=name))

TI05-delivery/ows_framework/trunk/ows_server/ows_server/public/layout/ndg2.css

@@ -18 +18 @@
     border-left:1px solid wheat; border-right:1px solid wheat; border-top:1px solid wheat; }
 .tabcontent {padding:2px 10px; background: wheat; clear:both;}
-
+.tabcontent ul {list-style:none; font-size:50%; margin-left:0; padding-left:0; }
 /* Main Content */
 

TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/ndgPage.kid

@@ -54 +54 @@
                     <ul py:if="'selection' in session">
                         <li py:for="item in session['selection']">
-                        ${XML(h.link_to(item[0],item[1]))}</li>
+                        ${XML(h.link_to(item[1],item[0]))}</li>
                     </ul>
+                    ${XML(h.link_to_remote("Clear",dict(update="Left", url=h.url_for(controller="tabs", action="clear",value="Selection"))))}
                 </div>
             </div>

TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/stubB.kid

@@ -30 +30 @@
                     </ul></p>
                 </div>
+                <div py:if="c.doc.granules!=[]" id="Granules">
+                    <h4> Granules </h4>
+                    <table><tbody>
+                        <tr><td>Select</td><td>Access Control</td><td>Granule</td></tr>
+                        <tr py:for="granule in c.doc.granules">
+                            <td width="10%"><span class="selectme" py:if="'ndgSec' in session">
+                            ${XML(h.link_to_remote("Select",dict(update="Left", url=h.url_for(controller="tabs", action="addSelection",uri=granule.entryID,name=granule.name))))}
+                            </span></td><td width="10%"><span class="key"/></td>
+                            <td><a href="/view/$granule.entryID">$granule.name</a></td>
+                        </tr>
+                    </tbody></table>
+                </div>
+                
             </div> <!-- Metadata Div Ends -->
        
             <div id="Corrections">
-            <p> Please use this 
-                <span py:if="'ndgSec' in session">
+            <p py:if="'ndgSec' in session"> Please use this 
+                <span>
                     ${XML(h.link_to_remote("link",dict(update="Corrections", url=h.url_for(action='askCorrect'))))}
                 </span> to enter any errors in the metadata record above.