[mapserver-commits] r12481 - trunk/mapserver/mapcache/src

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:30:35 -0700 (Fri, 26 Aug 2011)
New Revision: 12481

Modified:
   trunk/mapserver/mapcache/src/configuration.c
Log:


Modified: trunk/mapserver/mapcache/src/configuration.c
===================================================================
--- trunk/mapserver/mapcache/src/configuration.c	2011-08-26 11:30:24 UTC (rev 12480)
+++ trunk/mapserver/mapcache/src/configuration.c	2011-08-26 11:30:35 UTC (rev 12481)
@@ -20,16 +20,16 @@
 #include <apr_file_io.h>
 
 void geocache_configuration_parse(geocache_context *ctx, const char *filename, geocache_cfg *config) {
+#ifdef ENABLE_UNMAINTAINED_JSON_PARSER
    int len = strlen(filename);
    const char *ext = &(filename[len-3]);
-#ifdef ENABLE_UNMAINTAINED_JSON_PARSER
-   if(!strcasecmp(ext,"xml")) {
-#endif
+   if(strcasecmp(ext,"xml")) {
+      geocache_configuration_parse_json(ctx,filename,config);
+   } else {
       geocache_configuration_parse_xml(ctx,filename,config);
-#ifdef ENABLE_UNMAINTAINED_JSON_PARSER
-   } else {
-      geocache_configuration_parse_json(ctx,filename,config);
    }
+#else
+   geocache_configuration_parse_xml(ctx,filename,config);
 #endif
    GC_CHECK_ERROR(ctx);