Changeset 6101 for cowsserver


Ignore:
Timestamp:
09/12/09 15:02:03 (10 years ago)
Author:
pnorton
Message:

Removed the csml_geoplot controller and re-adjusted the routing. Also fixed the catalogue template.

Location:
cowsserver/trunk/lib/cowsserver
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • cowsserver/trunk/lib/cowsserver/config/routing.py

    r5849 r6101  
    2121 
    2222    map.connect(':fileoruri/wms', controller='csmlwms') 
    23     map.connect(':fileoruri/wms2', controller='csmlwms_csml_geoplot') 
    24     map.connect(':fileoruri/wms3', controller='csmlwms_csml')     
     23    map.connect(':fileoruri/wms2', controller='csmlwms_csml')     
    2524     
    2625    map.connect('wcsroute', ':fileoruri/wcs', controller='csmlwcs') #wcsroute is a named route. 
    27     map.connect('wcsroute', ':fileoruri/wcs3', controller='csmlwcs') #wcsroute is a named route. 
     26     
    2827    map.connect(':fileoruri/wfs', controller='csmlwfs') 
    2928    #filestore - used for fetching files referenced by (csml) StorageDescriptors (WFS), and  'store' in wcs if implemented 
  • cowsserver/trunk/lib/cowsserver/templates/catalogue.xml

    r6097 r6101  
    2929        wms_url = url_for(controller='csmlwms', fileoruri=fc, id=None, 
    3030                        request='GetCapabilities', service='WMS',  
    31                         qualified=True, host=c.host) 
     31                        qualified=True) 
    3232 
    3333        wcs_url = url_for(controller='csmlwcs', fileoruri=fc, id=None, 
    3434                        request='GetCapabilities', service='WCS',  
    35                         qualified=True, host=c.host) 
     35                        qualified=True) 
    3636 
    3737        wfs_url = url_for(controller='csmlwfs', fileoruri=fc, id=None,  
    3838                        request='GetCapabilities', service='WFS',  
    39                         qualified=True, host=c.host) 
     39                        qualified=True) 
    4040      ?> 
    4141     
    4242      <li> 
    4343        ${fc_name} 
    44         [<a href="$wms_url}">WMS</a>]   
    45         [<a href="${wcs_url}">WCS</a>] 
    46         [<a href="${wfs_url}">WFS</a>] 
     44        [<a href="$wms_url">WMS</a>]   
     45        [<a href="$wcs_url">WCS</a>] 
     46        [<a href="$wfs_url">WFS</a>] 
    4747                    
    4848        <py:if test="cowsclient==True"> 
     
    6060        [<a href="${url_for(controller='csmlwfs', fileoruri=fc, id=None,  
    6161                        request='GetCapabilities', service='WFS', 
    62                         qualified=True, host=c.host)}" 
     62                        qualified=True)}" 
    6363                >WFS</a>] 
    6464      </li>  
Note: See TracChangeset for help on using the changeset viewer.