[mapserver-commits] r10717 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2010-11-12 07:57:45 -0800 (Fri, 12 Nov 2010)
New Revision: 10717

Modified:
   trunk/mapserver/mapwcs.c
   trunk/mapserver/mapwcs20.c
Log:
Added patch to address situation where libxml is not available (and WCS support is not requested). (#3595)

Modified: trunk/mapserver/mapwcs.c
===================================================================
--- trunk/mapserver/mapwcs.c	2010-11-12 15:35:22 UTC (rev 10716)
+++ trunk/mapserver/mapwcs.c	2010-11-12 15:57:45 UTC (rev 10717)
@@ -1818,12 +1818,18 @@
   wcsParamsObj *params;  
   int retVal = MS_DONE;
 
-  /* first try to dispatch WCS 20 */
+  /* First try to dispatch WCS 2.0 */
+  /* We need libxml2 for WCS 2.0   */
+#if defined(USE_LIBXML2)
   if ((retVal = msWCSDispatch20(map, request)) != MS_DONE )
   {
     msDebug("msWCSDispatch(): msWCSDispatch20() finished --> exiting\n");
     return retVal;
   }
+#else
+  /* TODO: If we don't have libxml2, then report WCS 2.0 requests  */
+  /* as unsupported if possible. Only KVP requests can be detected. */
+#endif /* defined(USE_LIBXML2) */
 
   /* populate the service parameters */
   params = msWCSCreateParams();

Modified: trunk/mapserver/mapwcs20.c
===================================================================
--- trunk/mapserver/mapwcs20.c	2010-11-12 15:35:22 UTC (rev 10716)
+++ trunk/mapserver/mapwcs20.c	2010-11-12 15:57:45 UTC (rev 10717)
@@ -28,6 +28,8 @@
  * DEALINGS IN THE SOFTWARE.
  ****************************************************************************/
 
+#if defined(USE_WCS_SVR) && defined(USE_LIBXML2)
+
 #include <assert.h>
 #include "mapserver.h"
 #include "maperror.h"
@@ -2982,3 +2984,5 @@
     msWCSFreeParamsObj20(params);
     return returnValue;
 }
+
+#endif /* defined(USE_WCS_SVR) && defined(USE_LIBXML2) */