[mapserver-commits] r9018 - in trunk: docs/ogc mapserver msautotest/wxs/expected

[svn at osgeo.org]

Author: tomkralidis
Date: 2009-05-15 08:04:41 -0400 (Fri, 15 May 2009)
New Revision: 9018

Modified:
   trunk/docs/ogc/sos_server.txt
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapogcsos.c
   trunk/msautotest/wxs/expected/sos_getobs_datablock.xml
Log:
fix SOS blockSeparator output (#3014)


Modified: trunk/docs/ogc/sos_server.txt
===================================================================
--- trunk/docs/ogc/sos_server.txt	2009-05-15 11:43:56 UTC (rev 9017)
+++ trunk/docs/ogc/sos_server.txt	2009-05-15 12:04:41 UTC (rev 9018)
@@ -479,7 +479,7 @@
 
 **sos_encoding_blockSeparator**
 
-- *Description:* (Optional) For GetObservation requests using resultModel=om:Observation (SWE DataBlock encoding).  Record separator to be used.  Default is '@@'
+- *Description:* (Optional) For GetObservation requests using resultModel=om:Observation (SWE DataBlock encoding).  Record separator to be used.  Default is '\\n'
 
 **sos_encoding_tokenSeparator**
 

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-05-15 11:43:56 UTC (rev 9017)
+++ trunk/mapserver/HISTORY.TXT	2009-05-15 12:04:41 UTC (rev 9018)
@@ -75,6 +75,8 @@
 
 - fix time advertising in WMS 1.3.0 (#2935)
 
+- fix SOS blockSeparator output (#3014)
+
 Version 5.4.0-beta3 (2009-3-5):
 --------------------------------
 

Modified: trunk/mapserver/mapogcsos.c
===================================================================
--- trunk/mapserver/mapogcsos.c	2009-05-15 11:43:56 UTC (rev 9017)
+++ trunk/mapserver/mapogcsos.c	2009-05-15 12:04:41 UTC (rev 9018)
@@ -548,6 +548,7 @@
     char szTmp[100];
     int i=0;
     char *pszTokenValue = NULL;
+    char *pszBlockValue = NULL;
     const char *pszBlockSep=NULL, *pszTokenSep=NULL;
 
     if (psParent)
@@ -629,15 +630,16 @@
         xmlNewNsProp(psSubNode, NULL, BAD_CAST "tokenSeparator", BAD_CAST pszTokenValue);
 
         if (pszBlockSep)
-          pszTokenValue = msStringConcatenate(pszTokenValue, (char *)pszBlockSep);
+          pszBlockValue = msStringConcatenate(pszBlockValue, (char *)pszBlockSep);
         else
-          pszTokenValue = msStringConcatenate(pszTokenValue, "\n");
+          pszBlockValue = msStringConcatenate(pszBlockValue, "\n");
 
-        xmlNewNsProp(psSubNode, NULL, BAD_CAST "blockSeparator", BAD_CAST pszTokenValue);
+        xmlNewNsProp(psSubNode, NULL, BAD_CAST "blockSeparator", BAD_CAST pszBlockValue);
 
         xmlNewNsProp(psSubNode, NULL, BAD_CAST "decimalSeparator", BAD_CAST ".");
 
         msFree(pszTokenValue);
+        msFree(pszBlockValue);
     }   
 }
 

Modified: trunk/msautotest/wxs/expected/sos_getobs_datablock.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_getobs_datablock.xml	2009-05-15 11:43:56 UTC (rev 9017)
+++ trunk/msautotest/wxs/expected/sos_getobs_datablock.xml	2009-05-15 12:04:41 UTC (rev 9018)
@@ -43,7 +43,7 @@
             </swe:DataRecord>
           </swe:components>
           <swe:encoding>
-            <swe:TextBlock tokenSeparator="," blockSeparator=",&#10;" decimalSeparator="."/>
+            <swe:TextBlock tokenSeparator="," blockSeparator="&#10;" decimalSeparator="."/>
           </swe:encoding>
         </swe:DataBlockDefinition>
       </om:resultDefinition>
@@ -84,7 +84,7 @@
             </swe:DataRecord>
           </swe:components>
           <swe:encoding>
-            <swe:TextBlock tokenSeparator="," blockSeparator=",&#10;" decimalSeparator="."/>
+            <swe:TextBlock tokenSeparator="," blockSeparator="&#10;" decimalSeparator="."/>
           </swe:encoding>
         </swe:DataBlockDefinition>
       </om:resultDefinition>
@@ -125,7 +125,7 @@
             </swe:DataRecord>
           </swe:components>
           <swe:encoding>
-            <swe:TextBlock tokenSeparator="," blockSeparator=",&#10;" decimalSeparator="."/>
+            <swe:TextBlock tokenSeparator="," blockSeparator="&#10;" decimalSeparator="."/>
           </swe:encoding>
         </swe:DataBlockDefinition>
       </om:resultDefinition>