[mapserver-commits] r9498 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2009-10-20 09:38:46 -0400 (Tue, 20 Oct 2009)
New Revision: 9498

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapogcsos.c
   trunk/mapserver/mapwcs11.c
   trunk/mapserver/mapwfs11.c
Log:
Fixed encoding metadata ignored by a few wcs/wfs 1.1 and sos requests (#3182)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-10-20 03:27:18 UTC (rev 9497)
+++ trunk/mapserver/HISTORY.TXT	2009-10-20 13:38:46 UTC (rev 9498)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fixed encoding metadata ignored by a few wcs/wfs 1.1 and sos requests (#3182)
+
 - PHP/Mapscript: added "autofollow" and "repeatdistance" in labelObj (#3175)
 
 - Added charset in content-type http header for wms/wfs/sos/wcs requests (#2583)

Modified: trunk/mapserver/mapogcsos.c
===================================================================
--- trunk/mapserver/mapogcsos.c	2009-10-20 03:27:18 UTC (rev 9497)
+++ trunk/mapserver/mapogcsos.c	2009-10-20 13:38:46 UTC (rev 9498)
@@ -106,7 +106,7 @@
   else
       msIO_printf("Content-type: text/xml%c%c",10,10);
 
-  xmlDocDumpFormatMemoryEnc(psDoc, &buffer, &size, "ISO-8859-1", 1);
+  xmlDocDumpFormatMemoryEnc(psDoc, &buffer, &size, (encoding ? encoding : "ISO-8859-1"), 1);
     
   msIO_printf("%s", buffer);
 
@@ -1712,14 +1712,14 @@
                              "<?xml version='1.0' encoding=\"%s\" standalone=\"no\" ?>\n",
                              "ISO-8859-1");
     */
-     /*xmlDocDumpFormatMemoryEnc(psDoc, &buffer, &size, "ISO-8859-1", 1);*/
+     /*xmlDocDumpFormatMemoryEnc(psDoc, &buffer, &size, (encoding ? encoding : "ISO-8859-1"), 1);*/
      
      /* xmlDocDump crashs withe the prebuild windows binaries distibutes at the libxml site???.
       It works with locally build binaries*/
      
      context = msIO_getHandler(stdout);
 
-     xmlDocDumpFormatMemoryEnc(psDoc, &buffer, &size, "ISO-8859-1", 1);
+     xmlDocDumpFormatMemoryEnc(psDoc, &buffer, &size, (encoding ? encoding : "ISO-8859-1"), 1);
      msIO_contextWrite(context, buffer, size);
      xmlFree(buffer);
 
@@ -2572,7 +2572,7 @@
 
      
      context = msIO_getHandler(stdout);
-     xmlDocDumpFormatMemoryEnc(psDoc, &buffer, &size, "ISO-8859-1", 1);
+     xmlDocDumpFormatMemoryEnc(psDoc, &buffer, &size, (encoding ? encoding : "ISO-8859-1"), 1);
      msIO_contextWrite(context, buffer, size);
      free(schemalocation);
      free(xsi_schemaLocation);

Modified: trunk/mapserver/mapwcs11.c
===================================================================
--- trunk/mapserver/mapwcs11.c	2009-10-20 03:27:18 UTC (rev 9497)
+++ trunk/mapserver/mapwcs11.c	2009-10-20 13:38:46 UTC (rev 9498)
@@ -86,7 +86,7 @@
   else
       msIO_printf("Content-type: text/xml%c%c",10,10);
 
-  xmlDocDumpFormatMemoryEnc(psDoc, &buffer, &size, "ISO-8859-1", 1);
+  xmlDocDumpFormatMemoryEnc(psDoc, &buffer, &size, (encoding ? encoding : "ISO-8859-1"), 1);
     
   msIO_printf("%s", buffer);
 
@@ -569,7 +569,7 @@
     
     context = msIO_getHandler(stdout);
 
-    xmlDocDumpFormatMemoryEnc(psDoc, &buffer, &size, "ISO-8859-1", 1);
+    xmlDocDumpFormatMemoryEnc(psDoc, &buffer, &size, (encoding ? encoding : "ISO-8859-1"), 1);
     msIO_contextWrite(context, buffer, size);
     xmlFree(buffer);
 
@@ -953,7 +953,7 @@
     
         context = msIO_getHandler(stdout);
 
-        xmlDocDumpFormatMemoryEnc(psDoc, &buffer, &size, "ISO-8859-1", 1);
+        xmlDocDumpFormatMemoryEnc(psDoc, &buffer, &size, (encoding ? encoding : "ISO-8859-1"), 1);
         msIO_contextWrite(context, buffer, size);
         xmlFree(buffer);
     }

Modified: trunk/mapserver/mapwfs11.c
===================================================================
--- trunk/mapserver/mapwfs11.c	2009-10-20 03:27:18 UTC (rev 9497)
+++ trunk/mapserver/mapwfs11.c	2009-10-20 13:38:46 UTC (rev 9498)
@@ -76,7 +76,7 @@
     else
         msIO_printf("Content-type: text/xml%c%c",10,10);
 
-    xmlDocDumpFormatMemoryEnc(psDoc, &buffer, &size, "ISO-8859-1", 1);
+    xmlDocDumpFormatMemoryEnc(psDoc, &buffer, &size, (encoding ? encoding : "ISO-8859-1"), 1);
     
     msIO_printf("%s", buffer);
 
@@ -411,7 +411,7 @@
     
     context = msIO_getHandler(stdout);
 
-    xmlDocDumpFormatMemoryEnc(psDoc, &buffer, &size, "ISO-8859-1", 1);
+    xmlDocDumpFormatMemoryEnc(psDoc, &buffer, &size, (encoding ? encoding : "ISO-8859-1"), 1);
     msIO_contextWrite(context, buffer, size);
     xmlFree(buffer);