Changeset 6111

Timestamp:

11/12/09 21:03:17 (11 years ago)

Author:

astephen

Message:

added date time validator and data type.

Location:

cows_wps/trunk/cows_wps

Files:

• process_handler/validate_arguments.py (modified) (7 diffs)
• renderer/form_renderer.py (modified) (3 diffs)
• utils/parse_capabilities_config.py (modified) (3 diffs)

cows_wps/trunk/cows_wps/process_handler/validate_arguments.py

@@ -16 +16 @@
 import sys
 import re
+import dateutil.parser
+import datetime
 
 import logging
@@ -41 +43 @@
     if dtype in ("xml", "filepath"): 
         dtype = "string"
+    elif dtype == "datetime":
+        return parseDateTime(item)
+    elif dtype in ("bbox",):
+        dtype = "float"
 
     transformer = dtype
@@ -129 +135 @@
 
     return array
+
+
+def parseDateTime(item):
+    """
+    Checks that item is a valid date time string: 'YYYY-MM-DDThh:mm:ss'.
+    """
+    pattn = re.compile("^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}$")
+    if not pattn.match(item):
+        raise Exception("Item does not match date/time pattern.")
+
+    date_time_value = dateutil.parser.parse("2008-02-23T12:12:12")
+    return date_time_value
 
 
@@ -161 +179 @@
         log.debug("Validating list of arguments:(%s)" % (self.args,))
         
-#        log.debug("NOTE: policy of this code is to ignore any unknown arguments but not to raise an exception")
+        # NOTE:policy of this code is to ignore any unknown arguments but not to raise an exception
         for name in arg_names:
-#            log.debug('Validating argument %s' % name)
+
             try:
                 # define d as the entry for this particular argument
@@ -171 +189 @@
                 if name not in self.args.keys():
                     log.debug ("DataInput %s not present in args" % (name,))
-                    #check if it is optional or has a default value
-                    
+
+                    # Check if it is optional or has a default value
                     if d.has_key("default"):
                         value = d["default"]
@@ -192 +210 @@
              
                 new_dict[name] = parseValue(value_given, d)
-#                log.debug("Using value of %s for %s" % (new_dict[name], name))
                 
             except:
@@ -205 +222 @@
                             % (recievedParam, self.process_name))
         
-#        log.debug("VALID DICT: %s" % new_dict) 
         return new_dict
 

cows_wps/trunk/cows_wps/renderer/form_renderer.py

@@ -37 +37 @@
         Returns HTML for text input including onChange validator.
         """
-        allowed_dtypes = ("float", "int", "string")
+        allowed_dtypes = ("float", "int", "string", "datetime")
+
         if dtype not in allowed_dtypes:
             raise Exception("Invalid type sent to FormRenderer.renderTextInput(): %s" % dtype)
@@ -43 +44 @@
         validators = {"int": ("/^[0-9]+$/", "The %s input must be an integer." % name), 
                       "float": ("/^[-+]?([0-9]*\.[0-9]+|[0-9]+)$/", "The %s input must be a decimal number." % name),
-                      "string": ("/[0-9a-zA-Z]+/", "The %s input must include text characters." % name)}
+                      "string": ("/[0-9a-zA-Z]+/", "The %s input must include text characters." % name),
+                      "datetime": ("/[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}/", "The %s input must be a date/time entry as follows YYYY-MM-DDThh:mm:ss (e.g. 2009-01-01T12:00:00)." % name)}
 
         (regex, msg) = validators[dtype]
@@ -61 +63 @@
 
         return html
+
+    def renderBBox(self, name, extent):
+        """
+        Renders a bounding box and N/W/S/E selectors.
+        """
+        html = """      <script type="text/javascript" src="/js/ext/jquery-1.3.2/jquery-1.3.2.js"></script>
+        <script type="text/javascript" src="http://openlayers.org/api/OpenLayers.js"></script>
+        <script type="text/javascript" src="/js/ui/openlayers-x.js"></script>
+        <script type="text/javascript" src="/js/ui/boundingBoxMapSelect.js"></script>
+        <script type="text/javascript">
+                var layers = new Array();
+                var layer_data = false;
+                var bboxSelect = false;
+
+                $(document).ready(function() {
+                        var layer_data = new OpenLayers.Layer.WMS( "World Map", "http://labs.metacarta.com/wms-c/Basic.py?", {layers: 'basic', format: 'image/png' } );
+                        layers.push(layer_data);
+                        var bboxSelect = new BoundingBoxMapSelect('map', 'bounds_control_container', layers,  'bbox_hidden_input', null);
+                });
+        </script>
+
+        <div id="bounding_container">
+                <div id="bounds_control_container"></div>       
+                <div id="map_container">
+                        <div id='map'></div>
+                </div>
+                <input type="hidden" name="bbox" id="bbox_hidden_input" value="" />
+        </div>
+        """
+        return html     
 
     def renderTypeAheadDirList(self, name, base_dir):

cows_wps/trunk/cows_wps/utils/parse_capabilities_config.py

@@ -16 +16 @@
 Keywords        "default:<default_value>" AND/OR "optional"     None, one or both, comma-separated. For neither just use "-"
 Enumerated Values       <s1>,<s2>,<s3>  Comma-separated list of values that all entries must be one of. Use "-" for none.
-Base directory applies to filepath type which is a string that should be a filepath
 """
 
@@ -66 +65 @@
     outin_dict = {}
 
-    allowed_types = ("xml", 'complex','xml_complex_value',"string", "float", "int", "bool", "filepath")
+    allowed_types = ("xml", 'complex','xml_complex_value',"string", "float", "int", "bool", "filepath", "bbox", "datetime")
 
     for item in outputInputDict:
@@ -129 +128 @@
                 if  outputInputDict.has_key(param + ".basedir"):
                     item_dict["basedir"] = outputInputDict[param+ ".basedir"].strip()
+
+                if outputInputDict.has_key(param + ".extent"):
+                    item_dict["extent"] = outputInputDict[param + ".extent"].strip()
 
                 outin_dict[param.strip()] = item_dict