[mapserver-commits] r9304 - trunk/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2009-09-15 08:27:55 -0400 (Tue, 15 Sep 2009)
New Revision: 9304

Modified:
   trunk/mapserver/mapogcsos.c
Log:
use msLayerResultsGetShape instead of msLayerGetShape (RFC-52) #3069

Modified: trunk/mapserver/mapogcsos.c
===================================================================
--- trunk/mapserver/mapogcsos.c	2009-09-15 11:53:28 UTC (rev 9303)
+++ trunk/mapserver/mapogcsos.c	2009-09-15 12:27:55 UTC (rev 9304)
@@ -670,7 +670,7 @@
     {
         msInitShape(&sShape);
     
-        status = msLayerGetShape(lp, &sShape, 
+        status = msLayerResultsGetShape(lp, &sShape, 
                                  lp->resultcache->results[iFeatureId].tileindex, 
                                  lp->resultcache->results[iFeatureId].shapeindex);
         if(status != MS_SUCCESS) {
@@ -912,7 +912,7 @@
     const char *pszSep=NULL;
 
     msInitShape(&sShape);
-    status = msLayerGetShape(lp, &sShape, 
+    status = msLayerResultsGetShape(lp, &sShape, 
                              lp->resultcache->results[iFeatureId].tileindex, 
                              lp->resultcache->results[iFeatureId].shapeindex);
     if(status != MS_SUCCESS) 
@@ -1567,7 +1567,7 @@
                                  for(k=0; k<lpTmp->resultcache->numresults; k++)
                                  {      
                                      msInitShape(&sShape);
-                                     status = msLayerGetShape(lp, &sShape, 
+                                     status = msLayerResultsGetShape(lp, &sShape, 
                                                               lpTmp->resultcache->results[k].tileindex, 
                                                               lpTmp->resultcache->results[k].shapeindex);
                                      if(status != MS_SUCCESS) 
@@ -1974,7 +1974,7 @@
 
                 for(k=0; k<lp->resultcache->numresults; k++) {      
                   msInitShape(&sShape);
-                  status = msLayerGetShape(lp, &sShape, lp->resultcache->results[k].tileindex, lp->resultcache->results[k].shapeindex);
+                  status = msLayerResultsGetShape(lp, &sShape, lp->resultcache->results[k].tileindex, lp->resultcache->results[k].shapeindex);
                   if(status != MS_SUCCESS) 
                     continue;
  
@@ -2672,7 +2672,7 @@
         if (lp->resultcache && lp->resultcache->numresults > 0) {
           for(j=0; j<lp->resultcache->numresults; j++) {      
             msInitShape(&sShape);     
-            status = msLayerGetShape(lp, &sShape, lp->resultcache->results[j].tileindex, lp->resultcache->results[j].shapeindex);
+            status = msLayerResultsGetShape(lp, &sShape, lp->resultcache->results[j].tileindex, lp->resultcache->results[j].shapeindex);
             if(status != MS_SUCCESS) 
               continue;