Changeset 2968 for TI05-delivery


Ignore:
Timestamp:
23/10/07 15:28:44 (12 years ago)
Author:
domlowe
Message:

more minor fixes to pass tests

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/controllers/csml_wcs1_0_0.py

    r2965 r2968  
    6060        } 
    6161 
    62  
     62         
    6363    def _createMultipartMime(self, xml, netcdf): 
    6464        #returns a multipart mime file containing the coverage xml + a netcdf file 
     
    208208    @operation 
    209209    @parameter('Service', possibleValues=['WCS'], required=True) 
    210     @parameter('Version', possibleValues=['','1.0.0']) 
     210    @parameter('Version', possibleValues=['','1.0.0'], required=True) 
    211211    @parameter('Coverage', required=True) 
    212212    @parameter('Format', possibleValues=['text/xml'])  #IS THIS MANDATORY 
    213     def DescribeCoverage(self, uri, version, service, coverage, format='text/xml'): 
     213    def DescribeCoverage(self, uri=None, version=None, service=None, coverage=None, format='text/xml'): 
    214214        """ 
    215215        WCS DescribeCoverage operation 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/csml_wcsx.py

    r2966 r2968  
    1515class CsmlWcsxController(OwsController): 
    1616    ''' Overarching version independent wcs controller that passes request to correct version of WCS controller (eg 1.0.0 or 1.1.1 etc) '''       
    17         
     17                      
    1818    def _getWCSController(self): 
    1919        ''' return the wcs controller that corresponds to the version requested 
     
    4141    @operation     
    4242    @parameter('Version', possibleValues=['1.0.0','1.1.0']) 
    43     def DescribeCoverage(self, version=None): 
     43    def DescribeCoverage(self, version=None,required=True): 
    4444        """ 
    4545        Use the right controller (correct version) to perform the DescribeCoverage operation 
    4646        """ 
    47         if version not in ['1.0.0','1.1.0']: 
    48             e=OWS_E.OwsError('Missing parameter',text='Version parameter missing', version = '1.0.0')             
    49             c.ex=e.report                 
    50             r=render_response('ogc_se', format='xml') 
    51             r.headers['content-type'] = 'application/vnd.ogc.se_xml' 
    52             return r 
    5347        self.version=version 
    5448        return self._getWCSController() 
     
    6155        Use the right controller (correct version) to perform the GetCoverage operation 
    6256        """         
    63         if version not in ['1.0.0','1.1.0']: 
    64             e=OWS_E.OwsError('Missing parameter',text='Version parameter missing', version = '1.0.0')             
    65             c.ex=e.report                 
    66             r=render_response('ogc_se', format='xml') 
    67             r.headers['content-type'] = 'application/vnd.ogc.se_xml' 
    68             return r 
    6957        self.version=version 
    7058        return self._getWCSController() 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/wcs1_0_0_Capabilities.kid

    r2962 r2968  
    3030        getelem=etree.Element("Get") 
    3131        oR=etree.Element("OnlineResource") 
    32         oR.attrib['xlink:href'] = op.get.href 
     32        oR.attrib['xlink:href'] = op.get.href+'?' 
    3333        oR.attrib['xlink:type'] = 'simple' 
    3434        getelem.append(oR) 
     
    3737        postelem=etree.Element("Post") 
    3838        oR=etree.Element("OnlineResource") 
    39         oR.attrib['xlink:href'] = op.post.href 
     39        oR.attrib['xlink:href'] = op.post.href+'?' 
    4040        oR.attrib['xlink:type'] = 'simple' 
    4141        postelem.append(oR) 
Note: See TracChangeset for help on using the changeset viewer.