add configuration, use correct DIM_* KVP for WMS

Author: tbonfort

lib/configuration_xml.c

@@ -96,6 +96,7 @@ void parseDimensions(mapcache_context *ctx, ezxml_t node, mapcache_tileset *tile
     char *name = (char*)ezxml_attr(dimension_node,"name");
     char *type = (char*)ezxml_attr(dimension_node,"type");
     char *unit = (char*)ezxml_attr(dimension_node,"unit");
+    char *skip_validation = (char*)ezxml_attr(dimension_node,"skip_validation");
     char *default_value = (char*)ezxml_attr(dimension_node,"default");
 
     mapcache_dimension *dimension = NULL;
@@ -112,6 +113,8 @@ void parseDimensions(mapcache_context *ctx, ezxml_t node, mapcache_tileset *tile
         dimension = mapcache_dimension_regex_create(ctx->pool);
       } else if(!strcmp(type,"intervals")) {
         dimension = mapcache_dimension_intervals_create(ctx->pool);
+      } else if(!strcmp(type,"sqlite")) {
+        dimension = mapcache_dimension_sqlite_create(ctx->pool);
       } else if(!strcmp(type,"time")) {
         ctx->set_error(ctx,501,"time dimension type not implemented yet");
         return;
@@ -130,6 +133,10 @@ void parseDimensions(mapcache_context *ctx, ezxml_t node, mapcache_tileset *tile
     if(unit && *unit) {
       dimension->unit = apr_pstrdup(ctx->pool,unit);
     }
+    
+    if(skip_validation && !strcmp(skip_validation,"true")) {
+      dimension->skip_validation = MAPCACHE_TRUE;
+    }
 
     if(default_value && *default_value) {
       dimension->default_value = apr_pstrdup(ctx->pool,default_value);

lib/service_wms.c

@@ -639,17 +639,28 @@ void _mapcache_service_wms_parse_request(mapcache_context *ctx, mapcache_service
           const char *value;
           if(tileset->dimensions) {
             for(i=0; i<tileset->dimensions->nelts; i++) {
+              char *dim_name;
               mapcache_dimension *dimension = APR_ARRAY_IDX(tileset->dimensions,i,mapcache_dimension*);
-              if((value = (char*)apr_table_get(params,dimension->name)) != NULL) {
+              if(!strcasecmp(dimension->name,"TIME") || !strcasecmp(dimension->name,"ELEVATION")) {
+                dim_name = dimension->name;
+              } else {
+                dim_name = apr_pstrcat(ctx->pool, "dim_", dimension->name, NULL);
+              }
+              if((value = (char*)apr_table_get(params,dim_name)) != NULL) {
                 char *tmpval = apr_pstrdup(ctx->pool,value);
-                int ok = dimension->validate(ctx,dimension,&tmpval);
-                GC_CHECK_ERROR(ctx);
+                int ok;
+                if(dimension->skip_validation) {
+                  ok = MAPCACHE_SUCCESS;
+                } else {
+                  ok = dimension->validate(ctx,dimension,&tmpval);
+                  GC_CHECK_ERROR(ctx);
+                }
                 if(ok == MAPCACHE_SUCCESS)
                   apr_table_setn(dimtable,dimension->name,tmpval);
                 else {
                   errcode = 400;
                   errmsg = apr_psprintf(ctx->pool, "dimension \"%s\" value \"%s\" fails to validate",
-                                        dimension->name, value);
+                                        dim_name, value);
                   goto proxies;
                 }
               }

lib/service_wmts.c

@@ -780,19 +780,20 @@ void _mapcache_service_wmts_parse_request(mapcache_context *ctx, mapcache_servic
     for(i=0; i<tileset->dimensions->nelts; i++) {
       char *tmpval;
       int ok;
+      const char *value;
       mapcache_dimension *dimension = APR_ARRAY_IDX(tileset->dimensions,i,mapcache_dimension*);
-      const char *value = apr_table_get(dimtable,dimension->name);
+      if(dimension->skip_validation) continue;
+      value = apr_table_get(dimtable,dimension->name);
       if(value) {
         tmpval = apr_pstrdup(ctx->pool,value);
         ok = dimension->validate(ctx,dimension,&tmpval);
         GC_CHECK_ERROR(ctx);
         if(ok != MAPCACHE_SUCCESS) {
           ctx->set_error(ctx,404,"dimension \"%s\" value \"%s\" fails to validate",
-                         dimension->name, value);
+                  dimension->name, value);
           if(kvp) ctx->set_exception(ctx,"InvalidParameterValue","%s",dimension->name);
           return;
         }
-
         /* re-set the eventually modified value in the dimension table */
         apr_table_set(dimtable,dimension->name,tmpval);
       }