Changeset 10101

Timestamp:

Apr 12, 2010, 7:59:44 PM (14 years ago)

Author:

warmerdam

Message:

avoid debug/error output for connectionless ogr layers with tileindexes

Location:

trunk/mapserver

Files:

• HISTORY.TXT (modified) (1 diff)
• mappool.c (modified) (1 diff)

trunk/mapserver/HISTORY.TXT

@@ -14 +14 @@
 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 

trunk/mapserver/mappool.c

@@ -187 +187 @@
     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;
     }