From 14f2ca6afd44b4ab5b324c98c19955747fb2f074 Mon Sep 17 00:00:00 2001
From: Homme Zwaagstra <hrz@geodata.soton.ac.uk>
Date: Mon, 18 Mar 2013 13:09:50 +0000
Subject: [PATCH] Remove old style CGI runtime substitutions

This fixes tests affected by the changes in mapserver/mapserver#4608.
---
 misc/expected/runtime_sub_test006.gif | Bin 5976 -> 5200 bytes
 misc/expected/runtime_sub_test007.txt |  10 ----------
 misc/expected/runtime_sub_test008.gif | Bin 5200 -> 0 bytes
 misc/runtime_sub.map                  |  25 +++----------------------
 query/query.map                       |   8 ++++----
 query/query_postgis.map               |   8 ++++----
 query/querymap.map                    |   8 ++++----
 7 files changed, 15 insertions(+), 44 deletions(-)
 delete mode 100644 misc/expected/runtime_sub_test007.txt
 delete mode 100644 misc/expected/runtime_sub_test008.gif

diff --git a/misc/expected/runtime_sub_test006.gif b/misc/expected/runtime_sub_test006.gif
index c59173638800b18d1fa95bc679af061a506be2a4..1e2197ebbe2263602f018baafd75e6d14e04f1c9 100644
GIT binary patch
delta 5195
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
F06W|*-QxfN

literal 5976
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
G0028G$V`X;

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
-
-<HTML>
-<HEAD><TITLE>MapServer Message</TITLE></HEAD><BODY BGCOLOR="#FFFFFF">
-msDrawMap(): Image handling error. Failed to draw layer named &#39;layer4&#39;.
-[stripped line matching "ShapefileOpen"]
-[stripped line matching "ShapefileOpen"]
-msValidateParameter(): Regular expression error. Parameter pattern validation failed.
-msEvalRegex(): Regular expression error. String failed expression test.
-</BODY></HTML>
\ 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 1e2197ebbe2263602f018baafd75e6d14e04f1c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5200
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
Kj_2@D0029aP2V2?

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