diff --git a/misc/expected/runtime_sub_test006.gif b/misc/expected/runtime_sub_test006.gif index c5917363..1e2197eb 100644 Binary files a/misc/expected/runtime_sub_test006.gif and b/misc/expected/runtime_sub_test006.gif differ diff --git a/misc/expected/runtime_sub_test007.txt b/misc/expected/runtime_sub_test007.txt deleted file mode 100644 index 6cb84d96..00000000 --- a/misc/expected/runtime_sub_test007.txt +++ /dev/null @@ -1,10 +0,0 @@ -Content-Type: text/html - - -MapServer Message -msDrawMap(): Image handling error. Failed to draw layer named 'layer4'. -[stripped line matching "ShapefileOpen"] -[stripped line matching "ShapefileOpen"] -msValidateParameter(): Regular expression error. Parameter pattern validation failed. -msEvalRegex(): Regular expression error. String failed expression test. - \ No newline at end of file diff --git a/misc/expected/runtime_sub_test008.gif b/misc/expected/runtime_sub_test008.gif deleted file mode 100644 index 1e2197eb..00000000 Binary files a/misc/expected/runtime_sub_test008.gif and /dev/null differ diff --git a/misc/runtime_sub.map b/misc/runtime_sub.map index d0e433d1..23010b28 100644 --- a/misc/runtime_sub.map +++ b/misc/runtime_sub.map @@ -7,9 +7,7 @@ # RUN_PARMS: runtime_sub_test003.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=map&layer=layer2&name2=bad+value' > [RESULT_DEVERSION] [STRIP:ShapefileOpen] # RUN_PARMS: runtime_sub_test004.gif [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=map&layer=layer3&name3=bdry_counpy2' > [RESULT_DEMIME] # RUN_PARMS: runtime_sub_test005.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=map&layer=layer3&name3=bad+value' > [RESULT_DEVERSION] [STRIP:ShapefileOpen] -# RUN_PARMS: runtime_sub_test006.gif [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=map&layer=layer4&name4=bdry_counpy2' > [RESULT_DEMIME] -# RUN_PARMS: runtime_sub_test007.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=map&layer=layer4&name4=bad+value' > [RESULT_DEVERSION] [STRIP:ShapefileOpen] -# RUN_PARMS: runtime_sub_test008.gif [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=map&layer=layer5' > [RESULT_DEMIME] +# RUN_PARMS: runtime_sub_test006.gif [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=map&layer=layer4' > [RESULT_DEMIME] # MAP NAME 'runtime_sub' @@ -63,32 +61,15 @@ MAP END END - # old-style validation - LAYER - NAME 'layer4' - STATUS OFF - DATA '../query/data/%name4%' - TYPE POLYGON - METADATA - # 'default_name4' 'indx_q100kpy4' - 'name4_validation_pattern' 'bdry_counpy2|indx_q100kpy4' - END - CLASS - STYLE OUTLINECOLOR 51 51 51 END - END - END - # default value LAYER - NAME 'layer5' + NAME 'layer4' STATUS OFF DATA '../query/data/%name5%' TYPE POLYGON VALIDATION 'default_name5' 'indx_q100kpy4' - END - METADATA - 'name5_validation_pattern' 'bdry_counpy2|indx_q100kpy4' + 'name5' 'bdry_counpy2|indx_q100kpy4' END CLASS STYLE OUTLINECOLOR 51 51 51 END diff --git a/query/query.map b/query/query.map index 384dd049..33c31ce8 100644 --- a/query/query.map +++ b/query/query.map @@ -58,16 +58,16 @@ MAP LAYER NAME 'bdry_counpy2' - METADATA - qstring_validation_pattern '.' + VALIDATION + qstring '.' END INCLUDE 'include/bdry_counpy2_shapefile.map' END LAYER NAME 'indx_q100kpy4' - METADATA - qstring_validation_pattern '.' + VALIDATION + qstring '.' END INCLUDE 'include/indx_q100kpy4_shapefile.map' END diff --git a/query/query_postgis.map b/query/query_postgis.map index a6c4f251..c9f01dd5 100644 --- a/query/query_postgis.map +++ b/query/query_postgis.map @@ -57,16 +57,16 @@ MAP LAYER NAME 'bdry_counpy2' - METADATA - qstring_validation_pattern '.' + VALIDATION + qstring '.' END INCLUDE 'include/bdry_counpy2_postgis.map' END LAYER NAME 'indx_q100kpy4' - METADATA - qstring_validation_pattern '.' + VALIDATION + qstring '.' END INCLUDE 'include/indx_q100kpy4_shapefile.map' END diff --git a/query/querymap.map b/query/querymap.map index ed4ec212..3b96f917 100644 --- a/query/querymap.map +++ b/query/querymap.map @@ -53,16 +53,16 @@ MAP LAYER NAME 'bdry_counpy2' - METADATA - qstring_validation_pattern '.' + VALIDATION + qstring '.' END INCLUDE 'include/bdry_counpy2_shapefile.map' END LAYER NAME 'indx_q100kpy4' - METADATA - qstring_validation_pattern '.' + VALIDATION + qstring '.' END INCLUDE 'include/indx_q100kpy4_shapefile.map' END