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

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:14:59 -0700 (Fri, 26 Aug 2011)
New Revision: 12300

Modified:
   trunk/mapserver/mapcache/src/cache_disk.c
Log:
add GetFeatureInfo handling for WMS and WMTS services

closes issue 39.
thomas.bonfort | 2011-02-08 18:37:54 +0100 (Tue, 08 Feb 2011)

Modified: trunk/mapserver/mapcache/src/cache_disk.c
===================================================================
--- trunk/mapserver/mapcache/src/cache_disk.c	2011-08-26 11:14:55 UTC (rev 12299)
+++ trunk/mapserver/mapcache/src/cache_disk.c	2011-08-26 11:14:59 UTC (rev 12300)
@@ -25,7 +25,7 @@
 #include <unistd.h>
 #endif
 
-void _geocache_cache_disk_blank_tile_key(geocache_context *ctx, geocache_tile *tile, unsigned char *color, char **path) {
+static void _geocache_cache_disk_blank_tile_key(geocache_context *ctx, geocache_tile *tile, unsigned char *color, char **path) {
    *path = apr_psprintf(ctx->pool,"%s/%s/%s/blanks/%02X%02X%02X%02X.%s",
          ((geocache_cache_disk*)tile->tileset->cache)->base_directory,
          tile->tileset->name,
@@ -93,7 +93,7 @@
   
 }
 
-int _geocache_cache_disk_has_tile(geocache_context *ctx, geocache_tile *tile) {
+static int _geocache_cache_disk_has_tile(geocache_context *ctx, geocache_tile *tile) {
    char *filename;
    apr_file_t *f;
    _geocache_cache_disk_tile_key(ctx, tile, &filename);
@@ -114,7 +114,7 @@
  * \private \memberof geocache_cache_disk
  * \sa geocache_cache::tile_get()
  */
-int _geocache_cache_disk_get(geocache_context *ctx, geocache_tile *tile) {
+static int _geocache_cache_disk_get(geocache_context *ctx, geocache_tile *tile) {
    char *filename;
    apr_file_t *f;
    apr_finfo_t finfo;
@@ -173,7 +173,7 @@
  * \private \memberof geocache_cache_disk
  * \sa geocache_cache::tile_set()
  */
-void _geocache_cache_disk_set(geocache_context *ctx, geocache_tile *tile) {
+static void _geocache_cache_disk_set(geocache_context *ctx, geocache_tile *tile) {
    apr_size_t bytes;
    apr_file_t *f;
    apr_status_t ret;
@@ -296,7 +296,7 @@
 /**
  * \private \memberof geocache_cache_disk
  */
-void _geocache_cache_disk_configuration_parse(geocache_context *ctx, ezxml_t node, geocache_cache *cache) {
+static void _geocache_cache_disk_configuration_parse(geocache_context *ctx, ezxml_t node, geocache_cache *cache) {
    ezxml_t cur_node;
    geocache_cache_disk *dcache = (geocache_cache_disk*)cache;
 
@@ -319,7 +319,7 @@
 /**
  * \private \memberof geocache_cache_disk
  */
-void _geocache_cache_disk_configuration_check(geocache_context *ctx, geocache_cache *cache) {
+static void _geocache_cache_disk_configuration_check(geocache_context *ctx, geocache_cache *cache) {
    apr_status_t status;
    geocache_cache_disk *dcache = (geocache_cache_disk*)cache;
    /* check all required parameters are configured */