[mapserver-commits] r10935 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2011-02-04 11:43:58 -0800 (Fri, 04 Feb 2011)
New Revision: 10935

Modified:
   trunk/mapserver/mapgml.c
   trunk/mapserver/mapserver.h
   trunk/mapserver/mapwfs.c
Log:
Missed a few spots with RFC 65 changes (#3647).

Modified: trunk/mapserver/mapgml.c
===================================================================
--- trunk/mapserver/mapgml.c	2011-02-03 19:58:06 UTC (rev 10934)
+++ trunk/mapserver/mapgml.c	2011-02-04 19:43:58 UTC (rev 10935)
@@ -1456,10 +1456,7 @@
             continue;
         }
 
-        if(lp->resultcache->usegetshape)
-           status = msLayerGetShape(lp, &shape, lp->resultcache->results[j].tileindex, lp->resultcache->results[j].shapeindex);
-        else
-          status = msLayerResultsGetShape(lp, &shape, lp->resultcache->results[j].tileindex, lp->resultcache->results[j].shapeindex);        
+        status = msLayerGetShape(lp, &shape, &(lp->resultcache->results[j]));
         if(status != MS_SUCCESS) 
             return(status);
 

Modified: trunk/mapserver/mapserver.h
===================================================================
--- trunk/mapserver/mapserver.h	2011-02-03 19:58:06 UTC (rev 10934)
+++ trunk/mapserver/mapserver.h	2011-02-04 19:43:58 UTC (rev 10935)
@@ -2071,8 +2071,7 @@
 int msOGRLayerNextShape(layerObj *layer, shapeObj *shape);
 int msOGRLayerGetItems(layerObj *layer);
 void msOGRLayerFreeItemInfo(layerObj *layer);
-int msOGRLayerGetShape(layerObj *layer, shapeObj *shape, int tile, long record);
-int msOGRLayerResultGetShape(layerObj *layer, shapeObj *shape, int tile, long record);
+int msOGRLayerGetShape(layerObj *layer, shapeObj *shape, resultObj *record);
 int msOGRLayerGetExtent(layerObj *layer, rectObj *extent);
 
 #ifdef USE_OGR

Modified: trunk/mapserver/mapwfs.c
===================================================================
--- trunk/mapserver/mapwfs.c	2011-02-03 19:58:06 UTC (rev 10934)
+++ trunk/mapserver/mapwfs.c	2011-02-04 19:43:58 UTC (rev 10935)
@@ -2567,7 +2567,7 @@
                 {
                     memmove( lp->resultcache->results + 0,
                              lp->resultcache->results + to_skip, 
-                             sizeof(resultCacheMemberObj) * (lp->resultcache->numresults - to_skip) );
+                             sizeof(resultObj) * (lp->resultcache->numresults - to_skip) );
                     lp->resultcache->numresults -= to_skip;
                     to_skip = 0;
                 }