Changeset 2811

Timestamp:

15/08/07 18:01:30 (14 years ago)

Author:

lawrence

Message:

More support for consuming CSML ...

Location:

TI05-delivery/ows_framework/trunk/ows_server/ows_server

Files:

• controllers/retrieve.py (modified) (3 diffs)
• templates/csml_granule_summary.kid (modified) (1 diff)
• templates/selection.kid (modified) (1 diff)

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

@@ -39 +39 @@
             c.xml='<p>%s</p>'%status
             return render_response('error')
-        status,x=interface(self.uri,self.cf,logger=self.logger,format=self.format)
+        status,x=interface.GetXML(uri)
         
         if status:
             #(the return object x is an xmlHandler object)
-            c.xml=x.tohtml()
+            c.xml=x.xmls
             return Response(c.xml)
         else:
@@ -100 +100 @@
             r='error'
         
-        if status: session['lastViewed']=h.current_url()
+        if status: 
+            needed=0
+            if 'lastViewed' not in session: needed=1
+            session['lastViewed']=h.current_url()
+            if needed: c.pageTabs.append(('Display',session['lastViewed']))
         
         if status and 'ndgSec' in session:
@@ -115 +119 @@
         
         if status: session.save()
-       
+        
         if r=='content':
             #we're showing an xml document ... but it could go wrong if

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

@@ -4 +4 @@
         <p> Link functions not yet implemented</p>
         <ul>
+            <?python y=1/0 ?>
             <li py:for="f_name in c.dataset.getFeatureList()">
-                <?python f=c.dataset.getFeature(f_name)?>
+                <?python f=c.dataset.getFeature(f_name)
+                         X=dir(f)?>
                 $f.description.CONTENT --> [Add] [Remove] [Add from all Granules] [Remove from all Granules]
+                $X
             </li>
         </ul>

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

@@ -14 +14 @@
                 <ol>
                     <li py:for="i in session['selection']" class="dataset">
-                        <?python divid='csml_%s'%i[0] ?>
+                        <?python 
+                        divid='csml_%s'%i[0] 
+                        xml=h.url_for(controller='retrieve',action='index',uri=i[0])
+                        pretty=h.url_for(controller='retrieve',action='view',uri=i[0])
+                        ?>
                         ${XML(h.link_to_remote(i[1],dict(update=divid,
                                             url=h.url_for(controller="selection",
-                                            action="expand",uri=i[0]))))}
+                                            action="expand",uri=i[0]))))} 
+                         (<span py:replace="linkimage(xml,g.icons_xml,'[XML]')"/>,
+                          <span py:replace="linkimage(pretty,g.icons_prn,'[HTML]')"/>)
                         <div id="$divid"/>
                     </li>