Changeset 2970 for TI05-delivery


Ignore:
Timestamp:
25/10/07 13:05:36 (12 years ago)
Author:
lawrence
Message:

Fixes for ticket:805

Location:
TI05-delivery/ows_framework/trunk/ows_server/ows_server
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/geoUtilities.py

    r2680 r2970  
    5050                      <tr><td colspan="2" align="center">%s</td></tr> 
    5151                    </tbody></table>'''%tuple(self.boxes[0]) 
     52                     
     53    def __str__(self): 
     54        return '%s,%s'%(self.nboxes,self.boxes) 
    5255 
    5356class TimeCoverage: 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/stubB.py

    r2967 r2970  
    119119        #bounding box, handled as a class because this is going to be difficult ... 
    120120        self.bbox=Bounding(self.elem,entity='stubB') 
    121         self.temporal() 
     121        self.timeCoverage=self.temporal() 
     122        print 'BOUNDING',self.bbox,self.timeCoverage 
    122123        #parameters 
    123124        plist=wrapGetText(self.elem,'dgDataSummary/dgParameterSummary/ParameterName',multiple=1) 
     
    141142        t=self.elem.find('dgDataSummary/dgDataCoverage/dgTemporalCoverage/DateRange') 
    142143        if t is not None: 
    143            try: 
    144                 self.timeCoverage=(float(i.text) for i in t) 
    145            except: 
    146                 self.timeCoverage=('',) 
    147                                  
     144            c=[self.helper.getText(t,'DateRangeStart'),] 
     145            c.append(self.helper.getText(t,'DateRangeEnd')) 
    148146        else: 
    149            t=self.elem.find('dgDataSummary/dgDataCoverage/dgTemporalCoverage/DateSingle') 
    150            try: 
    151                 self.timeCoverage=(t.text,) 
    152            except: 
    153                 self.timeCoverage=('',) 
     147            c=(self.helper.getText(self.elem, 
     148                    'dgDataSummary/dgDataCoverage/dgTemporalCoverage/DateSingle'),) 
     149        c.append(self.helper.getText(self.elem,'dgDataSummary/dgDatasetStatus/dgDatasetClosure')) 
     150        return c 
    154151 
    155152class dgMetadataDescription: 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/stubB.kid

    r2967 r2970  
    88        <div id="entirepage"> ${XML(c.tbinfo)} <div py:replace="header()"/> 
    99            <div py:replace="PageTabs('Display')"/> 
    10             <div py:replace="searchOneLine()"/> 
     10            <div py:replace="searchOneLine(targets='Browse')"/> 
    1111            <!--! The if on the call to the left panel needs to be here for subtle css reasons  
    1212            <div py:if="'ndgSec' in session" py:replace="leftpanel()" id="Left"/> 
     
    4545                     
    4646                    <div py:replace="ParameterList(c.doc.parameters)"/> 
     47                    <div py:if="c.doc.stubBtype=='dgDataEntity'" py:replace="Coverage(c.doc.bbox,c.doc.timeCoverage)"/> 
    4748                    <div py:if="c.doc.granules!=[]" id="Granules"> 
    4849                        <table cellspacing="0" cellpadding="3" border="0" width="100%"> 
Note: See TracChangeset for help on using the changeset viewer.