[mapserver-commits] r10643 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2010-10-22 07:02:49 -0700 (Fri, 22 Oct 2010)
New Revision: 10643

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/maperror.c
   trunk/mapserver/maperror.h
   trunk/mapserver/mapserv.c
Log:
Fixed duplicated XML and HTML errors from WFS GetFeature (#3571)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-10-22 13:09:07 UTC (rev 10642)
+++ trunk/mapserver/HISTORY.TXT	2010-10-22 14:02:49 UTC (rev 10643)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fixed duplicated XML and HTML errors from WFS GetFeature (#3571)
+
 - Support group names for GetLegendGraphic and GetStyles (#3411)
 
 - apply patch (thanks rouault) to advertise resultType=hits in WFS 1.1 Capabilities (#3575)

Modified: trunk/mapserver/maperror.c
===================================================================
--- trunk/mapserver/maperror.c	2010-10-22 13:09:07 UTC (rev 10642)
+++ trunk/mapserver/maperror.c	2010-10-22 14:02:49 UTC (rev 10643)
@@ -199,11 +199,13 @@
       {
           new_error->next = ms_error->next;
           new_error->code = ms_error->code;
+          new_error->isreported = ms_error->isreported;
           strcpy(new_error->routine, ms_error->routine);
           strcpy(new_error->message, ms_error->message);
 
           ms_error->next = new_error;
           ms_error->code = MS_NOERR;
+          ms_error->code = MS_FALSE;
           ms_error->routine[0] = '\0';
           ms_error->message[0] = '\0';
       }
@@ -351,6 +353,7 @@
   while (ms_error && ms_error->code != MS_NOERR)
   {
       msIO_fprintf(stream, "%s: %s %s <br>\n", ms_error->routine, ms_errorCodes[ms_error->code], ms_error->message);
+      ms_error->isreported = MS_TRUE;
       ms_error = ms_error->next;
   }
 }
@@ -366,6 +369,7 @@
 
       msIO_fprintf(stream, "%s: %s %s\n", ms_error->routine, 
                    ms_errorCodes[ms_error->code], message);
+      ms_error->isreported = MS_TRUE;
       ms_error = ms_error->next;
 
       msFree(message);

Modified: trunk/mapserver/maperror.h
===================================================================
--- trunk/mapserver/maperror.h	2010-10-22 13:09:07 UTC (rev 10642)
+++ trunk/mapserver/maperror.h	2010-10-22 14:02:49 UTC (rev 10643)
@@ -97,6 +97,7 @@
   int code;
   char routine[ROUTINELENGTH];
   char message[MESSAGELENGTH];
+  int isreported;
 #ifndef SWIG
   struct error_obj *next;
 #endif

Modified: trunk/mapserver/mapserv.c
===================================================================
--- trunk/mapserver/mapserv.c	2010-10-22 13:09:07 UTC (rev 10642)
+++ trunk/mapserver/mapserv.c	2010-10-22 14:02:49 UTC (rev 10643)
@@ -1280,8 +1280,8 @@
       */
       if( status == MS_FAILURE ) {
         errorObj *ms_error = msGetErrorObj();
-
-        if( ms_error->code != MS_NOERR )
+        
+        if( (ms_error->code != MS_NOERR) && (ms_error->isreported == MS_FALSE) )
           writeError();
       }