[mapserver-commits] r10496 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2010-09-02 16:20:13 +0000 (Thu, 02 Sep 2010)
New Revision: 10496

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/shptreevis.c
Log:
avoid terminating before we have processed all nodes, was quiting early if there were more nodes than shapes being indexed

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-09-02 13:21:24 UTC (rev 10495)
+++ trunk/mapserver/HISTORY.TXT	2010-09-02 16:20:13 UTC (rev 10496)
@@ -14,6 +14,9 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- shptreevis: bug truncates visualization shapefile if there are more
+  nodes in the tree than there are shapes being indexed! 
+
 - Fixed multiple include tags not supported in xml mapfiles (#3530)
 
 - Support reading .dbf files between 2GB and 4GB (#3514)

Modified: trunk/mapserver/shptreevis.c
===================================================================
--- trunk/mapserver/shptreevis.c	2010-09-02 13:21:24 UTC (rev 10495)
+++ trunk/mapserver/shptreevis.c	2010-09-02 16:20:13 UTC (rev 10496)
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id:$
+ * $Id$
  *
  * Project:  MapServer
  * Purpose:  Utility program to visualize a quadtree
@@ -167,13 +167,8 @@
 /*	Skim over the list of shapes, printing all the vertices.	*/
 /* -------------------------------------------------------------------- */
 
-    pos = ftell (qix->fp);
-    j = 0;
-
-    while( pos && (j < qix->nShapes) )
+    while( TRUE )
     {
-      j ++;
-
       node = readTreeNode (qix);
       if (node )
       {
@@ -230,7 +225,7 @@
 #endif
         }
         else 
-        { pos = 0; }
+            break;
     }
 
 #ifdef MAPSERVER