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

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:25:18 -0700 (Fri, 26 Aug 2011)
New Revision: 12432

Modified:
   trunk/mapserver/mapcache/src/service_wmts.c
Log:
ifdef-out the JSON config file experiment
thomas.bonfort | 2011-08-16 10:51:06 +0200 (Tue, 16 Aug 2011)

Modified: trunk/mapserver/mapcache/src/service_wmts.c
===================================================================
--- trunk/mapserver/mapcache/src/service_wmts.c	2011-08-26 11:25:14 UTC (rev 12431)
+++ trunk/mapserver/mapcache/src/service_wmts.c	2011-08-26 11:25:18 UTC (rev 12432)
@@ -114,6 +114,8 @@
       const char *title = apr_table_get(tileset->metadata,"title");
       if(title) {
          ezxml_set_txt(ezxml_add_child(layer,"ows:Title",0),title);
+      } else {
+         ezxml_set_txt(ezxml_add_child(layer,"ows:Title",0),tileset->name);
       }
       const char *abstract = apr_table_get(tileset->metadata,"abstract");
       if(abstract) {
@@ -267,7 +269,7 @@
    }
    char *tmpcaps = ezxml_toxml(caps);
    ezxml_free(caps);
-   request->request.capabilities = apr_pstrdup(ctx->pool,tmpcaps);
+   request->request.capabilities = apr_pstrcat(ctx->pool,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n",tmpcaps,NULL);
    free(tmpcaps);
 }