[mapserver-commits] r10967 - in trunk/msautotest/query: . data
expected template
svn at osgeo.org
svn at osgeo.org
Tue Feb 8 00:38:56 EST 2011
Author: sdlime
Date: 2011-02-07 21:38:55 -0800 (Mon, 07 Feb 2011)
New Revision: 10967
Added:
trunk/msautotest/query/data/indx_q100kpy4.dbf
trunk/msautotest/query/data/indx_q100kpy4.shp
trunk/msautotest/query/data/indx_q100kpy4.shx
trunk/msautotest/query/expected/query_test001.txt
trunk/msautotest/query/expected/query_test002.txt
trunk/msautotest/query/expected/query_test003.txt
trunk/msautotest/query/expected/query_test004.txt
trunk/msautotest/query/expected/query_test005.txt
trunk/msautotest/query/expected/query_test006.txt
trunk/msautotest/query/expected/query_test007.txt
trunk/msautotest/query/expected/query_test008.txt
trunk/msautotest/query/expected/query_test009.txt
trunk/msautotest/query/expected/query_test010.txt
trunk/msautotest/query/expected/query_test011.txt
trunk/msautotest/query/query.map
trunk/msautotest/query/template/
trunk/msautotest/query/template/query.tmpl
Log:
A new set of query tests using the CGI and various query modes.
Added: trunk/msautotest/query/data/indx_q100kpy4.dbf
===================================================================
(Binary files differ)
Property changes on: trunk/msautotest/query/data/indx_q100kpy4.dbf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/msautotest/query/data/indx_q100kpy4.shp
===================================================================
(Binary files differ)
Property changes on: trunk/msautotest/query/data/indx_q100kpy4.shp
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/msautotest/query/data/indx_q100kpy4.shx
===================================================================
(Binary files differ)
Property changes on: trunk/msautotest/query/data/indx_q100kpy4.shx
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/msautotest/query/expected/query_test001.txt
===================================================================
--- trunk/msautotest/query/expected/query_test001.txt (rev 0)
+++ trunk/msautotest/query/expected/query_test001.txt 2011-02-08 05:38:55 UTC (rev 10967)
@@ -0,0 +1,2 @@
+St. Louis:STLO Cass:CASS Aitkin:AITK Crow Wing:CROW Carlton:CARL Pine:PINE Mille Lacs:MILL
+
Added: trunk/msautotest/query/expected/query_test002.txt
===================================================================
--- trunk/msautotest/query/expected/query_test002.txt (rev 0)
+++ trunk/msautotest/query/expected/query_test002.txt 2011-02-08 05:38:55 UTC (rev 10967)
@@ -0,0 +1,2 @@
+St. Louis:STLO Cass:CASS Aitkin:AITK Crow Wing:CROW Carlton:CARL Pine:PINE Mille Lacs:MILL
+name:Pine River name:Port Wing name:Aitkin name:Duluth name:Brainerd name:Mille Lacs Lake name:Sandstone
Added: trunk/msautotest/query/expected/query_test003.txt
===================================================================
--- trunk/msautotest/query/expected/query_test003.txt (rev 0)
+++ trunk/msautotest/query/expected/query_test003.txt 2011-02-08 05:38:55 UTC (rev 10967)
@@ -0,0 +1,2 @@
+Itasca:ITAS
+
Added: trunk/msautotest/query/expected/query_test004.txt
===================================================================
--- trunk/msautotest/query/expected/query_test004.txt (rev 0)
+++ trunk/msautotest/query/expected/query_test004.txt 2011-02-08 05:38:55 UTC (rev 10967)
@@ -0,0 +1,2 @@
+Itasca:ITAS
+name:Pokegama Lake
Added: trunk/msautotest/query/expected/query_test005.txt
===================================================================
--- trunk/msautotest/query/expected/query_test005.txt (rev 0)
+++ trunk/msautotest/query/expected/query_test005.txt 2011-02-08 05:38:55 UTC (rev 10967)
@@ -0,0 +1,2 @@
+Carlton:CARL
+
Added: trunk/msautotest/query/expected/query_test006.txt
===================================================================
--- trunk/msautotest/query/expected/query_test006.txt (rev 0)
+++ trunk/msautotest/query/expected/query_test006.txt 2011-02-08 05:38:55 UTC (rev 10967)
@@ -0,0 +1,2 @@
+Carlton:CARL
+name:Duluth
Added: trunk/msautotest/query/expected/query_test007.txt
===================================================================
--- trunk/msautotest/query/expected/query_test007.txt (rev 0)
+++ trunk/msautotest/query/expected/query_test007.txt 2011-02-08 05:38:55 UTC (rev 10967)
@@ -0,0 +1,2 @@
+Cass:CASS Carlton:CARL Carver:CARV
+
Added: trunk/msautotest/query/expected/query_test008.txt
===================================================================
--- trunk/msautotest/query/expected/query_test008.txt (rev 0)
+++ trunk/msautotest/query/expected/query_test008.txt 2011-02-08 05:38:55 UTC (rev 10967)
@@ -0,0 +1,2 @@
+Carlton:CARL
+
Added: trunk/msautotest/query/expected/query_test009.txt
===================================================================
--- trunk/msautotest/query/expected/query_test009.txt (rev 0)
+++ trunk/msautotest/query/expected/query_test009.txt 2011-02-08 05:38:55 UTC (rev 10967)
@@ -0,0 +1,2 @@
+Itasca:ITAS
+name:Blackduck name:Bigfork name:Cass Lake name:Pokegama Lake
Added: trunk/msautotest/query/expected/query_test010.txt
===================================================================
--- trunk/msautotest/query/expected/query_test010.txt (rev 0)
+++ trunk/msautotest/query/expected/query_test010.txt 2011-02-08 05:38:55 UTC (rev 10967)
@@ -0,0 +1,2 @@
+St. Louis:STLO Itasca:ITAS Aitkin:AITK Carlton:CARL Pine:PINE
+name:Pokegama Lake name:Hibbing name:Aitkin name:Duluth name:Mille Lacs Lake name:Sandstone
Added: trunk/msautotest/query/expected/query_test011.txt
===================================================================
--- trunk/msautotest/query/expected/query_test011.txt (rev 0)
+++ trunk/msautotest/query/expected/query_test011.txt 2011-02-08 05:38:55 UTC (rev 10967)
@@ -0,0 +1,2 @@
+St. Louis:STLO Itasca:ITAS Aitkin:AITK Carlton:CARL Pine:PINE
+name:Pokegama Lake name:Hibbing name:Aitkin name:Duluth name:Mille Lacs Lake name:Sandstone
Added: trunk/msautotest/query/query.map
===================================================================
--- trunk/msautotest/query/query.map (rev 0)
+++ trunk/msautotest/query/query.map 2011-02-08 05:38:55 UTC (rev 10967)
@@ -0,0 +1,74 @@
+#
+# Test CGI Query Modes (+templated output)
+#
+# REQUIRES: INPUT=SHAPEFILE OUTPUT=PNG SUPPORTS=GEOS
+#
+# Test 1: simple mode=nquery, one layer, rect-based
+# RUN_PARMS: query_test001.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=nquery&mapext=420000+5120000+582000+5200000&qlayer=bdry_counpy2' > [RESULT_DEMIME]
+#
+# Test 2: simple mode=nquery, multiple layers, rect-based
+# RUN_PARMS: query_test002.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=nquery&mapext=420000+5120000+582000+5200000&layers=all' > [RESULT_DEMIME]
+#
+# Test 3: simple mode=nquery, one layer, point-based
+# RUN_PARMS: query_test003.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=query&qlayer=bdry_counpy2&mapxy=467000+5259000' > [RESULT_DEMIME]
+#
+# Test 4: simple mode=nquery, multiple layers, point-based
+# RUN_PARMS: query_test004.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=nquery&mapxy=467000+5259000&layers=all' > [RESULT_DEMIME]
+#
+# Test 5: simple mode=nquery, one layer, point-based (image coords)
+# RUN_PARMS: query_test005.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=nquery&imgext=420000+5120000+582000+5200000&imgsize=300+300&imgxy=150+150&qlayer=bdry_counpy2' > [RESULT_DEMIME]
+#
+# Test 6: simple mode=nquery, multiple layers, point-based (image coords)
+# RUN_PARMS: query_test006.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=nquery&imgext=420000+5120000+582000+5200000&imgsize=300+300&imgxy=150+150&layers=all' > [RESULT_DEMIME]
+#
+# Test 7: simple mode=itemnquery (regex)
+# RUN_PARMS: query_test007.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=itemnquery&qlayer=bdry_counpy2&qstring=/^Ca/&qitem=cty_name' > [RESULT_DEMIME]
+#
+# Test 8: simple mode=itemquery (logical expression)
+# RUN_PARMS: query_test008.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=itemnquery&qlayer=bdry_counpy2&qstring=("[cty_name]"%20%3D%20"Carlton")' > [RESULT_DEMIME]
+#
+# Test 9: simple mode=featurequery
+# RUN_PARMS: query_test009.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=featurequery&slayer=bdry_counpy2&mapxy=467000+5259000&qlayer=indx_q100kpy4' > [RESULT_DEMIME]
+#
+# Test 10: simple mode=nquery w/shape, multiple layers
+# RUN_PARMS: query_test010.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=nquery&mapshape=468000+5185000+510700+5250000+520500+5111000+468000+5185000&layers=all' > [RESULT_DEMIME]
+#
+# Test 11: simple mode=nquery w/shape as WKT, multiple layers
+# RUN_PARMS: query_test011.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=nquery&mapshape=POLYGON((468000+5185000,510700+5250000,520500+5111000,468000+5185000))&layers=all' > [RESULT_DEMIME]
+#
+MAP
+ NAME 'query'
+ EXTENT 125000 4785000 789000 5489000
+ UNITS METERS
+
+ WEB
+ QUERYFORMAT 'tmpl'
+ END
+
+ OUTPUTFORMAT
+ NAME 'tmpl'
+ DRIVER 'TEMPLATE'
+ MIMETYPE 'text/html'
+ FORMATOPTION "FILE=template/query.tmpl"
+ END
+
+ LAYER
+ NAME 'bdry_counpy2'
+ METADATA
+ qstring_validation_pattern '.'
+ END
+ INCLUDE 'include/bdry_counpy2_shapefile.map'
+ END
+
+ LAYER
+ NAME 'indx_q100kpy4'
+ DATA 'data/indx_q100kpy4'
+ STATUS OFF
+ TYPE QUERY
+ METADATA
+ qstring_validation_pattern '.'
+ END
+ TEMPLATE 'void'
+ END
+END
+
\ No newline at end of file
Added: trunk/msautotest/query/template/query.tmpl
===================================================================
--- trunk/msautotest/query/template/query.tmpl (rev 0)
+++ trunk/msautotest/query/template/query.tmpl 2011-02-08 05:38:55 UTC (rev 10967)
@@ -0,0 +1,3 @@
+<!-- MapServer Template -->
+[resultset layer="bdry_counpy2"][feature][CTY_NAME]:[CTY_ABBR] [/feature][/resultset]
+[resultset layer="indx_q100kpy4"][feature]name:[TILE_NAME] [/feature][/resultset]
More information about the mapserver-commits
mailing list