[mapserver-commits] r10101 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2010-04-12 22:59:44 -0400 (Mon, 12 Apr 2010)
New Revision: 10101

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mappool.c
Log:
avoid debug/error output for connectionless ogr layers with tileindexes

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-04-13 00:16:07 UTC (rev 10100)
+++ trunk/mapserver/HISTORY.TXT	2010-04-13 02:59:44 UTC (rev 10101)
@@ -14,6 +14,9 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Avoid errors and debug output for CONNECTION-less OGR layers in mappool.c
+  if they have a tileindex.
+
 - Implement support for raw imagemodes to use NULLVALUE formatoption to set 
   the background value of result images, and to try and mark nodata (#1709)
 

Modified: trunk/mapserver/mappool.c
===================================================================
--- trunk/mapserver/mappool.c	2010-04-13 00:16:07 UTC (rev 10100)
+++ trunk/mapserver/mappool.c	2010-04-13 02:59:44 UTC (rev 10101)
@@ -186,14 +186,22 @@
 /* -------------------------------------------------------------------- */
     if( layer->connection == NULL )
     {
-        msDebug( "%s: Missing CONNECTION on layer %s.\n",
-                 "msConnPoolRegister()", 
-                 layer->name );
-
-        msSetError( MS_MISCERR, 
-                    "Missing CONNECTION on layer %s.",
-                    "msConnPoolRegister()", 
-                    layer->name );
+        if( layer->tileindex != NULL
+            && layer->connectiontype == MS_OGR )
+        {
+            /* this is ok, no need to make a fuss */
+        }
+        else
+        {
+            msDebug( "%s: Missing CONNECTION on layer %s.\n",
+                     "msConnPoolRegister()", 
+                     layer->name );
+            
+            msSetError( MS_MISCERR, 
+                        "Missing CONNECTION on layer %s.",
+                        "msConnPoolRegister()", 
+                        layer->name );
+        }
         return;
     }