Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove old style CGI runtime substitutions #14

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove old style CGI runtime substitutions #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified misc/expected/runtime_sub_test006.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 0 additions & 10 deletions misc/expected/runtime_sub_test007.txt
View file
Open in desktop

This file was deleted.

Binary file removed misc/expected/runtime_sub_test008.gif
View file
Open in desktop
Binary file not shown.
25 changes: 3 additions & 22 deletions misc/runtime_sub.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions query/query.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions query/query_postgis.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions query/querymap.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down