Changeset 2647
- Timestamp:
- 25/06/07 22:01:52 (14 years ago)
- Location:
- TI05-delivery/ows_framework/trunk/ows_server/ows_server
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
TI05-delivery/ows_framework/trunk/ows_server/ows_server/config/routing.py
r2646 r2647 55 55 map.connect('discovery',controller='discovery') 56 56 map.connect('updatetab/:value',controller='tabs',action='update') 57 map.connect('addSelection/:uri/:name',controller='tabs',action='addSelection') 58 map.connect('clear/:value',controller='tabs',action='clear') 57 59 58 60 return map -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/retrieve.py
r2646 r2647 65 65 c.doc=stubB.stubB(x.tree,self.cf) 66 66 c.tbinfo=self.__mytb() 67 name=c.doc.abbreviation 67 68 elif self.uri.schema=='NDG-A0': 68 69 r='csml' … … 86 87 c.xml='<div class="error">%s</div>'%x 87 88 r='content' 89 90 if 'ndgSec' in session: 91 #we can update the history 92 if 'history' not in session: 93 session['history']=[(self.uri,name),] 94 else: 95 rb=Utilities.RingBuffer(10) 96 for i in session['history']: rb.append(i) 97 rb.append((uri,name)) 98 session['history']=rb.tolist() 99 session.save() 100 88 101 return render_response(r) 89 102 -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/tabs.py
r2639 r2647 1 1 from ows_server.lib.base import * 2 from ows_server.models import Utilities 2 3 3 4 class TabsController(BaseController): … … 15 16 return render_response('cart',fragment=True) 16 17 18 def addSelection(self,uri,name): 19 if 'selection' not in session: 20 session['selection']=[(uri,name),] 21 else: 22 rb=Utilities.RingBuffer(10) 23 for i in session['selection']: rb.append(i) 24 rb.append((uri,name)) 25 session['selection']=rb.tolist() 26 session.save() 27 return render_response('cart',fragment=True) 28 29 def clear(self,value): 30 31 if value=='History': 32 session['history']=[] 33 elif value=='Selection': 34 session['selection']=[] 35 session.save() 36 return render_response('cart',fragment=True) -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/stubB.py
r2643 r2647 24 24 from elementtree import ElementTree as ET 25 25 26 def idconvert(helper,elem,config=None ):26 def idconvert(helper,elem,config=None,idelem='dgMetadataID'): 27 27 ''' Given an elementTree element for a dgMetadataID, create 28 28 a standard ndg URI, and produce an ndgObject ''' 29 id=helper.find(elem, 'dgMetadataID')29 id=helper.find(elem,idelem) 30 30 entryID='%s__%s__%s'%(helper.getText(id,'repositoryIdentifier'), 31 31 helper.getText(id,'schemeIdentifier'), … … 53 53 self.constraints=AccessControl(helper.find(elem,'accessControlPolicy')) 54 54 self.name=name 55 self.uri=idconvert(helper,elem,config )55 self.uri=idconvert(helper,elem,config,idelem='dataModelID') 56 56 self.entryID=self.uri.uri 57 57 … … 96 96 i+=1 97 97 #following needs to be refactored when granule definition includes a proper name ... 98 name=wrapGetText(item,' name')98 name=wrapGetText(item,'dgGranuleSummary/dgGranuleName') 99 99 if name=='': name='Granule %s'%i 100 100 self.granules.append(dataGranule(self.helper,item,self.config,name=name)) -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/public/layout/ndg2.css
r2643 r2647 18 18 border-left:1px solid wheat; border-right:1px solid wheat; border-top:1px solid wheat; } 19 19 .tabcontent {padding:2px 10px; background: wheat; clear:both;} 20 20 .tabcontent ul {list-style:none; font-size:50%; margin-left:0; padding-left:0; } 21 21 /* Main Content */ 22 22 -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/ndgPage.kid
r2639 r2647 54 54 <ul py:if="'selection' in session"> 55 55 <li py:for="item in session['selection']"> 56 ${XML(h.link_to(item[ 0],item[1]))}</li>56 ${XML(h.link_to(item[1],item[0]))}</li> 57 57 </ul> 58 ${XML(h.link_to_remote("Clear",dict(update="Left", url=h.url_for(controller="tabs", action="clear",value="Selection"))))} 58 59 </div> 59 60 </div> -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/stubB.kid
r2646 r2647 30 30 </ul></p> 31 31 </div> 32 <div py:if="c.doc.granules!=[]" id="Granules"> 33 <h4> Granules </h4> 34 <table><tbody> 35 <tr><td>Select</td><td>Access Control</td><td>Granule</td></tr> 36 <tr py:for="granule in c.doc.granules"> 37 <td width="10%"><span class="selectme" py:if="'ndgSec' in session"> 38 ${XML(h.link_to_remote("Select",dict(update="Left", url=h.url_for(controller="tabs", action="addSelection",uri=granule.entryID,name=granule.name))))} 39 </span></td><td width="10%"><span class="key"/></td> 40 <td><a href="/view/$granule.entryID">$granule.name</a></td> 41 </tr> 42 </tbody></table> 43 </div> 44 32 45 </div> <!-- Metadata Div Ends --> 33 46 34 47 <div id="Corrections"> 35 <p > Please use this36 <span py:if="'ndgSec' in session">48 <p py:if="'ndgSec' in session"> Please use this 49 <span> 37 50 ${XML(h.link_to_remote("link",dict(update="Corrections", url=h.url_for(action='askCorrect'))))} 38 51 </span> to enter any errors in the metadata record above.
Note: See TracChangeset
for help on using the changeset viewer.