Changeset 2681 for TI05-delivery


Ignore:
Timestamp:
02/07/07 11:18:45 (12 years ago)
Author:
domlowe
Message:

unicode problem in ndgObject wrapped with str

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

Legend:

Unmodified
Added
Removed
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/config/routing.py

    r2674 r2681  
    2727    # change these when security layer is present and not before 
    2828    #to 
    29     # map.connect('wms/:uri',controller='csml_wms') 
    30     # map.connect('wcs/:uri',controller='csml_wcs') 
     29    #map.connect('wms/:uri',controller='csml_wms') 
     30    #map.connect('wcs/:uri',controller='csml_wcs') 
    3131     
    3232    map.connect(':file/wms', controller='csml_wms') 
    3333    map.connect('wcs/:fileoruri', controller='csml_wcs') 
    34     map.connect(':file/wcs', controller='csml_wcs') 
     34    map.connect(':fileoruri/wcs', controller='csml_wcs') 
    3535    map.connect(':file/status/:jobID', controller='status', action='getStatus') 
    3636     
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/csml_wcs.py

    r2677 r2681  
    128128        """ 
    129129        # Populate the context object with information required by the template 
    130         #c.dataset = get_csml_document(fileoruri) 
    131130         
    132131        #get doc from cache or disk: 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/lib/csml_util.py

    r2677 r2681  
    4040            #it's an NDG identifier, get the document from exist. 
    4141            uri=fileoruri 
    42             uri='badc.nerc.ac.uk__NDG-A0__ReMryRVA'         
     42            print type(uri) 
     43            #uri='badc.nerc.ac.uk__NDG-A0__ReMryRVA' 
     44            uri=str(uri) 
    4345            uriN=ndgObject.ndgObject(uri) 
    4446            cf=request.environ['ndgConfig'] 
     
    5153                    securityTokens=securityTokens) 
    5254            d=csml.parser.Dataset() 
     55            #print x 
    5356            d.parseElemTree(x.tree)                          
    5457        return d 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/ndgObject.py

    r2680 r2681  
    1313        Real services should also be available, and at some point of course the services should be looked up  
    1414        at a service registry, but that's not yet available. ''' 
    15          
     15        uri=str(uri) #Dom had problem with unicode coming in here ... dunno why @@@@ 
    1616        self.gettable=-1  # The specific record is not known to be gettable via any service 
    1717                          # other values of gettable allowed are  
Note: See TracChangeset for help on using the changeset viewer.