[mapserver-commits] r10024 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2010-03-27 13:58:16 -0400 (Sat, 27 Mar 2010)
New Revision: 10024

Modified:
   trunk/mapserver/mapquery.c
Log:
Revert r9829 and produce better error message when loadQuery() filename extension check fails (#3302)

Modified: trunk/mapserver/mapquery.c
===================================================================
--- trunk/mapserver/mapquery.c	2010-03-27 17:52:04 UTC (rev 10023)
+++ trunk/mapserver/mapquery.c	2010-03-27 17:58:16 UTC (rev 10024)
@@ -221,11 +221,14 @@
   /* 
   ** Make sure the file at least has the right extension. 
   */ 
-  if(msEvalRegex("\\.qy$", filename) != MS_TRUE) return MS_FAILURE; 
+  if(msEvalRegex("\\.qy$", filename) != MS_TRUE) {
+    msSetError(MS_MISCERR, "Query file extension check failed on %s (extension must be .qy)", "msLoadQuery()", filename);
+    return MS_FAILURE; 
+  }
 
   stream = fopen(filename, "r");
   if(!stream) {
-    msSetError(MS_IOERR, "Query file extension check failed on %s (extension must be .qy)", "msLoadQuery()", filename);
+    msSetError(MS_IOERR, "(%s)", "msLoadQuery()", filename);
     return(MS_FAILURE);
   }