Changeset 2848

Timestamp:

28/08/07 16:06:06 (14 years ago)

Author:

domlowe

Message:

fixed unicode problem when selecting time ranges in wcs

Location:

TI05-delivery/ows_framework/trunk/ows_server/ows_server

Files:

• controllers/csml_wcs.py (modified) (3 diffs)
• lib/validators.py (modified) (3 diffs)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/csml_wcs.py

@@ -259 +259 @@
         sel[lat]=(boundingbox[1], boundingbox[3])
         sel[lon]=(boundingbox[0], boundingbox[2])
-        sel[t]=timesequence
+        if  type(timesequence) is unicode:
+            sel[t]=str(timesequence)
+        else:
+            sel[t]=timesequence
+        
         #z is the 4th axis (eg height or pressure).
         #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 @@
         
         axisNames=feature.getAxisLabels()
-    
-                    
+
         # Extract via CSML.subsetToGridSeries()
         if store:
@@ -327 +330 @@
             except:
                 #0.9.5
-                return Response(content=msg, mimetype='multipart') 
-                  
-        #comment out for now while testing         
+                return Response(content=msg, mimetype='multipart')                     
         #except Exception, e:
             #if isinstance(e, OWS_E.OwsError):

TI05-delivery/ows_framework/trunk/ows_server/ows_server/lib/validators.py

@@ -74 +74 @@
     #2002-03-01T13:00:00.0Z
     #2002-03-01T13:00:00.0
-    
     def _checkTime(timestring):
         import re
-        stringtotest=timestring
         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]?$')
 
@@ -85 +83 @@
                 return timestring[:-1]
             else:
-                return stringtotest
+                return timestring
         else: 
             #timestring is not ok.
@@ -103 +101 @@
         newtimelist=[]
         for t in timelist:
-            newtimelist.append(_checkTime(t))
+            newtimelist.append(str(_checkTime(t)))
         return tuple(newtimelist)