[mapserver-commits] r7395 - trunk/mapserver

[svn at osgeo.org]

Author: tomkralidis
Date: 2008-02-19 11:36:40 -0500 (Tue, 19 Feb 2008)
New Revision: 7395

Modified:
   trunk/mapserver/maperror.c
   trunk/mapserver/maperror.h
   trunk/mapserver/mapows.c
Log:
make generic OWS error for msParseVersionString (#2515)


Modified: trunk/mapserver/maperror.c
===================================================================
--- trunk/mapserver/maperror.c	2008-02-18 22:19:26 UTC (rev 7394)
+++ trunk/mapserver/maperror.c	2008-02-19 16:36:40 UTC (rev 7395)
@@ -81,7 +81,8 @@
 						"GML encoding error.",
             "SOS server error.",
 						"NULL parent pointer error.",
-            "AGG library error."
+            "AGG library error.",
+            "OWS error."
 };
 
 #ifndef USE_THREAD

Modified: trunk/mapserver/maperror.h
===================================================================
--- trunk/mapserver/maperror.h	2008-02-18 22:19:26 UTC (rev 7394)
+++ trunk/mapserver/maperror.h	2008-02-19 16:36:40 UTC (rev 7395)
@@ -78,7 +78,8 @@
 #define MS_SOSERR 37
 #define MS_NULLPARENTERR 38
 #define MS_AGGERR 39
-#define MS_NUMERRORCODES 40
+#define MS_OWSERR 40
+#define MS_NUMERRORCODES 41
 
 #define MESSAGELENGTH 2048
 #define ROUTINELENGTH 64

Modified: trunk/mapserver/mapows.c
===================================================================
--- trunk/mapserver/mapows.c	2008-02-18 22:19:26 UTC (rev 7394)
+++ trunk/mapserver/mapows.c	2008-02-19 16:36:40 UTC (rev 7395)
@@ -393,8 +393,8 @@
         digits = msStringSplit(pszVersion, '.', &numDigits);
         if (digits == NULL || numDigits < 2 || numDigits > 3)
         {
-            msSetError(MS_WMSERR, 
-                       "Invalid version (%s). OWS version must be in the "
+            msSetError(MS_OWSERR, 
+                       "Invalid version (%s). Version must be in the "
                        "format 'x.y' or 'x.y.z'",
                        "msOWSParseVersionString()", pszVersion);
             if (digits)