[mapserver-commits] r8902 - trunk/mapserver

[svn at osgeo.org]

Author: tamas
Date: 2009-04-12 12:58:47 -0400 (Sun, 12 Apr 2009)
New Revision: 8902

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/maplayer.c
   trunk/mapserver/maprasterquery.c
Log:
Prevent from changing the connection type to MS_RASTER when setConnectionType(MS_WMS) is used (#2908)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-04-12 16:49:02 UTC (rev 8901)
+++ trunk/mapserver/HISTORY.TXT	2009-04-12 16:58:47 UTC (rev 8902)
@@ -12,6 +12,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Prevent from changing the connection type to MS_RASTER when setConnectionType(MS_WMS) is used (#2908)
+
 - Improve rounding logic for computing the src_xoff/yoff (#2976)
 
 - Fix filename path processing for raster queries and WCS get coverage so 

Modified: trunk/mapserver/maplayer.c
===================================================================
--- trunk/mapserver/maplayer.c	2009-04-12 16:49:02 UTC (rev 8901)
+++ trunk/mapserver/maplayer.c	2009-04-12 16:58:47 UTC (rev 8902)
@@ -77,7 +77,7 @@
   if(layer->tileindex && layer->connectiontype == MS_SHAPEFILE)
     layer->connectiontype = MS_TILED_SHAPEFILE;
 
-  if(layer->type == MS_LAYER_RASTER )
+  if(layer->type == MS_LAYER_RASTER && layer->connectiontype != MS_WMS)
     layer->connectiontype = MS_RASTER;
 
   if ( ! layer->vtable) {

Modified: trunk/mapserver/maprasterquery.c
===================================================================
--- trunk/mapserver/maprasterquery.c	2009-04-12 16:49:02 UTC (rev 8901)
+++ trunk/mapserver/maprasterquery.c	2009-04-12 16:58:47 UTC (rev 8902)
@@ -190,7 +190,8 @@
     /* We need to do this or the layer->layerinfo will be interpreted */
     /* as shapefile access info because the default connectiontype is */
     /* MS_SHAPEFILE. */
-    layer->connectiontype = MS_RASTER;
+    if (layer->connectiontype != MS_WMS)
+        layer->connectiontype = MS_RASTER;
 
     rlinfo->query_result_hard_max = 1000000;