Changeset 2625 for TI05-delivery/ows_framework

Timestamp:

20/06/07 15:12:26 (12 years ago)

Author:

domlowe

Message:

Basic ISO8601 time validator added

Location:

TI05-delivery/ows_framework/trunk/ows_server

Files:

• development_dom.ini (modified) (1 diff)
• ows_server/controllers/csml_wcs.py (modified) (3 diffs)
• ows_server/lib/validators.py (modified) (2 diffs)

TI05-delivery/ows_framework/trunk/ows_server/development_dom.ini

@@ -9 +9 @@
 smtp_server = localhost
 error_email_from = paste@localhost
+configfile = ows_server/config/ndgDiscovery.config
 
 [server:main]

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

@@ -102 +102 @@
     @parameter('Identifier', required=True)
     @parameter('BoundingBox', required=True, validator=V.bbox_2d)
-    @parameter('TimeSequence',required=True)  #TODO, need validator to handle iso8601 time strings
-    @parameter('Format', possibleValues=['image/netcdf'], required=True)
+    @parameter('TimeSequence',required=True, validator=V.iso8601_time)  #TODO, need validator to handle iso8601 time strings
+    @parameter('Format', possibleValues=['application/netcdf'], required=True)
     @parameter('Store', possibleValues=['true', 'True', 'TRUE'])
     #TODO some more parameter to add here
@@ -116 +116 @@
     
             #set bounding box TODO
-            sel = dict(latitude=(boundingbox[1], boundingbox[3]), longitude=(boundingbox[0], boundingbox[2]))
+            sel = dict(latitude=(boundingbox[1], boundingbox[3]), longitude=(boundingbox[0], boundingbox[2]))           
             sel['time']=timesequence #needs validating
             
@@ -127 +127 @@
             #Depending on if the 'store' parameter is set, either return the netcdf file or a link to it.
             if store is not None: 
-                c.hyperlink = 'http://'+request.environ['HTTP_HOST']+'/'+os.path.basename(request.environ['paste.config']['app_conf']['publish_dir'])+'/'+filename
+                c.hyperlink = 'http://'+request.environ['HTTP_HOST']+'/'+os.path.basename(request.environ['paste.config']['app_conf']['publish_dir'])+'/'+os.path.basename(filename)
                 c.wcs_request=request.environ['HTTP_REFERER']
                 return render_response('wcs_asynchronous')
-            else:
+            else:                
                 netcdfFile=open(filename, 'r')
                 return Response(content=netcdfFile, mimetype='image/netcdf')    

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

@@ -39 +39 @@
 
     return bbox_t
+
+
+def iso8601_time(timestring):
+    """
+        Checks if timestring is a valid iso8601 time string or valid iso8601 time interval 
+        This is not a complete implementation of the full iso8601 spec (although could be extended to be so).
+        
+    """
+    import xml.utils.iso8601 as isoT
+    #single time value e.g. 2002-03-01T13:00:00Z
+    
+    #start and end times: e.g 2002-03-01T13:00:00Z/2003-05-11T15:30:00Z
+    
+    def _checkTime(timestring):
+        try: 
+            isoT.parse(timestring)
+            return timestring[:-1]  #return without the Z
+        except ValueError:
+            timestring=timestring + 'Z'   #maybe the Z has just been missed off
+            try:
+                isoT.parse(timestring)
+                return timestring[:-1]#return without the Z
+            except ValueError:               
+                raise InvalidParameterValue("Incorrect TimeSequence specification %s" % timestring, 'timeSequence')
+            
+    if timestring.find(',') == -1:
+        timelist=timestring.split('/')
+    else:
+        timelist=timestring.split(',')
+
+    if len(timelist) == 1:         
+        tOK=_checkTime(timelist[0])
+        return tOK
+    
+    else:
+        newtimelist=[]
+        for t in timelist:
+            newtimelist.append(_checkTime(t))
+        return tuple(newtimelist)
 
 
@@ -82 +121 @@
 
     return f
-