[mapserver-commits] r8849 - branches/branch-5-4/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2009-03-31 17:27:36 -0400 (Tue, 31 Mar 2009)
New Revision: 8849

Modified:
   branches/branch-5-4/mapserver/HISTORY.TXT
   branches/branch-5-4/mapserver/maplayer.c
Log:
setConnectionType(MS_WMS) doesn't work with mapscript (#2908)

Modified: branches/branch-5-4/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-4/mapserver/HISTORY.TXT	2009-03-31 20:30:46 UTC (rev 8848)
+++ branches/branch-5-4/mapserver/HISTORY.TXT	2009-03-31 21:27:36 UTC (rev 8849)
@@ -12,6 +12,8 @@
 Current Version:
 ----------------
 
+- setConnectionType(MS_WMS) doesn't work with mapscript (#2908)
+
 - Properly reset filter/filteritem when queryByAttribute() fails (#2808)
 
 - WMS GetImage and GetLegendGraphic formats should advertise AGG driver (#2957)

Modified: branches/branch-5-4/mapserver/maplayer.c
===================================================================
--- branches/branch-5-4/mapserver/maplayer.c	2009-03-31 20:30:46 UTC (rev 8848)
+++ branches/branch-5-4/mapserver/maplayer.c	2009-03-31 21:27:36 UTC (rev 8849)
@@ -1204,7 +1204,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;
     
 
@@ -1228,8 +1228,8 @@
             return(msPostGISLayerInitializeVirtualTable(layer));
             break;
         case(MS_WMS):
-              /* WMS isn't a public layer type, it isn't used anywhere */
-              return MS_FAILURE;
+            /* WMS should be treated as a raster layer */
+              return(msRASTERLayerInitializeVirtualTable(layer));
               break;
         case(MS_ORACLESPATIAL):
             return(msOracleSpatialLayerInitializeVirtualTable(layer));