Changeset 11078

Timestamp:

Mar 4, 2011, 9:20:03 PM (13 years ago)

Author:

sdlime

Message:

Remove map-oriented query modes (e.g.QUERYMAP). Use qformat parameter instead. (#3712)

Location:

trunk/mapserver

Files:

• HISTORY.TXT (modified) (1 diff)
• mapserv.c (modified) (10 diffs)
• mapserv.h (modified) (1 diff)
• maptemplate.h (modified) (1 diff)

trunk/mapserver/HISTORY.TXT

@@ -14 +14 @@
 Current Version (SVN trunk):
 ----------------------------
+
+- Remove map-oriented query modes (e.g. QUERYMAP). Use qformat parameter instead. (#3712)
 
 - Implement single-pass query handling in mssql2008 driver as per RFC 65.

trunk/mapserver/mapserv.c

@@ -1567 +1567 @@
         case ITEMFEATUREQUERY:
         case ITEMFEATURENQUERY:
-        case ITEMFEATUREQUERYMAP:
-        case ITEMFEATURENQUERYMAP:
           if((SelectLayerIndex = msGetLayerIndex(mapserv->map, SelectLayer)) == -1) { /* force the selection layer on */
             msSetError(MS_WEBERR, "Selection layer not set or references an invalid layer.", "mapserv()"); 
@@ -1593 +1591 @@
 
           mapserv->map->query.mode = MS_QUERY_MULTIPLE;
-          if(mapserv->Mode == ITEMFEATUREQUERY || mapserv->Mode == ITEMFEATUREQUERYMAP)
+          if(mapserv->Mode == ITEMFEATUREQUERY)
             mapserv->map->query.mode = MS_QUERY_SINGLE;
 
@@ -1601 +1599 @@
         case FEATUREQUERY:
         case FEATURENQUERY:
-        case FEATUREQUERYMAP:
-        case FEATURENQUERYMAP:
           if((SelectLayerIndex = msGetLayerIndex(mapserv->map, SelectLayer)) == -1) { /* force the selection layer on */
             msSetError(MS_WEBERR, "Selection layer not set or references an invalid layer.", "mapserv()"); 
@@ -1609 +1605 @@
           GET_LAYER(mapserv->map, SelectLayerIndex)->status = MS_ON;
       
-          if(mapserv->Mode == FEATUREQUERY || mapserv->Mode == FEATUREQUERYMAP) {
+          if(mapserv->Mode == FEATUREQUERY) {
             switch(QueryCoordSource) {
             case FROMIMGPNT:
@@ -1631 +1627 @@
             mapserv->map->query.layer = QueryLayerIndex;
             mapserv->map->query.slayer = SelectLayerIndex; /* this will trigger the feature query eventually */
-          } else { /* FEATURENQUERY/FEATURENQUERYMAP */
+          } else { /* FEATURENQUERY */
             switch(QueryCoordSource) {
             case FROMIMGPNT:
@@ -1661 +1657 @@
         case ITEMQUERY:
         case ITEMNQUERY:
-        case ITEMQUERYMAP:
-        case ITEMNQUERYMAP:
           if(QueryLayerIndex < 0 || QueryLayerIndex >= mapserv->map->numlayers) {
             msSetError(MS_WEBERR, "Query layer not set or references an invalid layer.", "mapserv()"); 
@@ -1687 +1681 @@
 
           mapserv->map->query.mode = MS_QUERY_MULTIPLE;
-          if(mapserv->Mode == ITEMQUERY || mapserv->Mode == ITEMQUERYMAP) mapserv->map->query.mode = MS_QUERY_SINGLE;
+          if(mapserv->Mode == ITEMQUERY) mapserv->map->query.mode = MS_QUERY_SINGLE;
           break;
         case NQUERY:
-        case NQUERYMAP:
           mapserv->map->query.mode = MS_QUERY_MULTIPLE; /* all of these cases return multiple results */
           mapserv->map->query.layer = QueryLayerIndex;
@@ -1788 +1781 @@
           break;
         case QUERY:
-        case QUERYMAP:
           switch(QueryCoordSource) {
           case FROMIMGPNT:
@@ -1813 +1805 @@
           break;
         case INDEXQUERY:
-        case INDEXQUERYMAP:
           mapserv->map->query.type = MS_QUERY_BY_INDEX;
           mapserv->map->query.mode = MS_QUERY_SINGLE;
@@ -1832 +1823 @@
         setExtentFromShapes();
 
-      /* just return the image, should be able to depricate these */
-      if(mapserv->Mode == QUERYMAP || mapserv->Mode == NQUERYMAP || mapserv->Mode == ITEMQUERYMAP || mapserv->Mode == ITEMNQUERYMAP || mapserv->Mode == FEATUREQUERYMAP || mapserv->Mode == FEATURENQUERYMAP || mapserv->Mode == ITEMFEATUREQUERYMAP || mapserv->Mode == ITEMFEATURENQUERYMAP || mapserv->Mode == INDEXQUERYMAP) {
-
-        checkWebScale(mapserv);
-
-        img = msDrawMap(mapserv->map, MS_TRUE);
-        if(!img) writeError();
-
-        if(mapserv->sendheaders) {
-          const char *attachment = msGetOutputFormatOption(mapserv->map->outputformat, "ATTACHMENT", NULL ); 
-          if(attachment) msIO_printf("Content-disposition: attachment; filename=%s\n", attachment);
-          msIO_printf("Content-type: %s%c%c",MS_IMAGE_MIME_TYPE(mapserv->map->outputformat), 10,10);
-         }
-        status = msSaveImage(mapserv->map, img, NULL);
-        if(status != MS_SUCCESS) writeError();
-        msFreeImage(img);
-
-      } else { /* process the query through templates */
-        if(msReturnTemplateQuery(mapserv, mapserv->map->web.queryformat, NULL) != MS_SUCCESS) writeError();
+      if(msReturnTemplateQuery(mapserv, mapserv->map->web.queryformat, NULL) != MS_SUCCESS) writeError();
           
-        if(mapserv->savequery) {
-          snprintf(buffer, sizeof(buffer), "%s%s%s%s", mapserv->map->web.imagepath, mapserv->map->name, mapserv->Id, MS_QUERY_EXTENSION);
-          if((status = msSaveQuery(mapserv->map, buffer, MS_FALSE)) != MS_SUCCESS) return status;
-        }
-      }
-
+      if(mapserv->savequery) {
+        snprintf(buffer, sizeof(buffer), "%s%s%s%s", mapserv->map->web.imagepath, mapserv->map->name, mapserv->Id, MS_QUERY_EXTENSION);
+        if((status = msSaveQuery(mapserv->map, buffer, MS_FALSE)) != MS_SUCCESS) return status;
+      }
+      
     } else if(mapserv->Mode == COORDINATE) {
       setCoordinate(); /* mouse click => map coord */

trunk/mapserver/mapserv.h

@@ -58 +58 @@
 ** Enumerated types, keep the query modes in sequence and at the end of the enumeration (mode enumeration is in maptemplate.h).
 */
-int numModes = 30;
-static char *modeStrings[30] = {"BROWSE","ZOOMIN","ZOOMOUT","MAP","LEGEND","LEGENDICON","REFERENCE","SCALEBAR","COORDINATE",
-                                "QUERY","QUERYMAP","NQUERY","NQUERYMAP",
-                                "ITEMQUERY","ITEMQUERYMAP","ITEMNQUERY","ITEMNQUERYMAP",
-                                "FEATUREQUERY","FEATUREQUERYMAP","FEATURENQUERY","FEATURENQUERYMAP",
-                                "ITEMFEATUREQUERY","ITEMFEATUREQUERYMAP","ITEMFEATURENQUERY","ITEMFEATURENQUERYMAP",
-                                "INDEXQUERY","INDEXQUERYMAP","TILE","OWS", "WFS"};
+int numModes = 21;
+static char *modeStrings[21] = {"BROWSE","ZOOMIN","ZOOMOUT","MAP","LEGEND","LEGENDICON","REFERENCE","SCALEBAR","COORDINATE",
+                                "QUERY","NQUERY","ITEMQUERY","ITEMNQUERY",
+                                "FEATUREQUERY","FEATURENQUERY","ITEMFEATUREQUERY","ITEMFEATURENQUERY",
+                                "INDEXQUERY","TILE","OWS", "WFS"};
 
 /*

trunk/mapserver/maptemplate.h

@@ -44 +44 @@
 
 enum modes {BROWSE, ZOOMIN, ZOOMOUT, MAP, LEGEND, LEGENDICON, REFERENCE, SCALEBAR, COORDINATE, 
-            QUERY, QUERYMAP, NQUERY, NQUERYMAP, 
-            ITEMQUERY, ITEMQUERYMAP, ITEMNQUERY, ITEMNQUERYMAP, 
-            FEATUREQUERY, FEATUREQUERYMAP, FEATURENQUERY, FEATURENQUERYMAP, 
-            ITEMFEATUREQUERY, ITEMFEATUREQUERYMAP, ITEMFEATURENQUERY, ITEMFEATURENQUERYMAP,
-            INDEXQUERY, INDEXQUERYMAP, TILE, OWS, WFS};
+            QUERY, NQUERY, ITEMQUERY, ITEMNQUERY, 
+            FEATUREQUERY, FEATURENQUERY, ITEMFEATUREQUERY, ITEMFEATURENQUERY, 
+            INDEXQUERY, TILE, OWS, WFS};