Changeset 2848
- Timestamp:
- 28/08/07 16:06:06 (14 years ago)
- Location:
- TI05-delivery/ows_framework/trunk/ows_server/ows_server
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/csml_wcs.py
r2833 r2848 259 259 sel[lat]=(boundingbox[1], boundingbox[3]) 260 260 sel[lon]=(boundingbox[0], boundingbox[2]) 261 sel[t]=timesequence 261 if type(timesequence) is unicode: 262 sel[t]=str(timesequence) 263 else: 264 sel[t]=timesequence 265 262 266 #z is the 4th axis (eg height or pressure). 263 267 #NOTE, need to decide whether bounding box is of form: x1,y1,z1,x2,y2,z2 or x1,y1,x2,y2,z1,z2 … … 273 277 274 278 axisNames=feature.getAxisLabels() 275 276 279 277 280 # Extract via CSML.subsetToGridSeries() 278 281 if store: … … 327 330 except: 328 331 #0.9.5 329 return Response(content=msg, mimetype='multipart') 330 331 #comment out for now while testing 332 return Response(content=msg, mimetype='multipart') 332 333 #except Exception, e: 333 334 #if isinstance(e, OWS_E.OwsError): -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/lib/validators.py
r2689 r2848 74 74 #2002-03-01T13:00:00.0Z 75 75 #2002-03-01T13:00:00.0 76 77 76 def _checkTime(timestring): 78 77 import re 79 stringtotest=timestring80 78 regex=re.compile('^([0-9]{2,4})-([0-1][0-9])-([0-3][0-9])T(?:([0-2][0-9]):([0-5][0-9]):([0-5][0-9]))?[.]?[0-5]?[0-9]?[Zz]?$') 81 79 … … 85 83 return timestring[:-1] 86 84 else: 87 return stringtotest85 return timestring 88 86 else: 89 87 #timestring is not ok. … … 103 101 newtimelist=[] 104 102 for t in timelist: 105 newtimelist.append( _checkTime(t))103 newtimelist.append(str(_checkTime(t))) 106 104 return tuple(newtimelist) 107 105
Note: See TracChangeset
for help on using the changeset viewer.