Remove of temporary file after processing Geonames Wikipedia information.

[andy/viking.git] / src / download.h

diff --git a/src/download.h b/src/download.h
index e0cb79964c89d502b4e23ae2ae7c502d9fda8593..e9f69c237bd6eba271813879beda56aefbeea4de 100644 (file)
--- a/src/download.h
+++ b/src/download.h
@@ -2,6 +2,7 @@
  * viking -- GPS Data and Topo Analyzer, Explorer, and Manager
  *
  * Copyright (C) 2003-2005, Evan Battaglia <gtoevan@gmx.net>
+ * Copyright (C) 2007, Guilhem Bonnefille <guilhem.bonnefille@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +25,8 @@
 
 #include <stdio.h>
 
+G_BEGIN_DECLS
+
 /* File content check */
 typedef gboolean (*VikFileContentCheckerFunc) (FILE*);
 gboolean a_check_map_file(FILE*);
@@ -34,10 +37,13 @@ typedef struct {
   /**
    * Check if the server has a more recent file than the one we have before downloading it
    * This uses http header If-Modified-Since
-   * Nevertheless, the current file cache must be older than the specified
-   * value.
    */
-  time_t check_file_server_time;
+  gboolean check_file_server_time;
+
+  /**
+   * Set if the server handle ETag
+   */
+  gboolean use_etag;
 
   /**
    * The REFERER string to use.
@@ -56,13 +62,29 @@ typedef struct {
    */
   VikFileContentCheckerFunc check_file;
 
-} DownloadOptions;
+} DownloadMapOptions;
+
+typedef struct {
+  /**
+   * Time sent to server on header If-Modified-Since
+   */
+  time_t time_condition;
+  /**
+   * Etag sent by server on previous download
+   */
+  char *etag;
+  /**
+   * Etag sent by server on this download
+   */
+  char *new_etag;
+
+} DownloadFileOptions;
 
 void a_download_init(void);
 
 /* TODO: convert to Glib */
-int a_http_download_get_url ( const char *hostname, const char *uri, const char *fn, DownloadOptions *opt, void *handle );
-int a_ftp_download_get_url ( const char *hostname, const char *uri, const char *fn, DownloadOptions *opt, void *handle );
+int a_http_download_get_url ( const char *hostname, const char *uri, const char *fn, DownloadMapOptions *opt, void *handle );
+int a_ftp_download_get_url ( const char *hostname, const char *uri, const char *fn, DownloadMapOptions *opt, void *handle );
 void *a_download_handle_init ();
 void a_download_handle_cleanup ( void *handle );
 
@@ -71,4 +93,6 @@ enum { DOWNLOAD_NO_ERROR = 0,
        DOWNLOAD_NO_NEWER_FILE,
        DOWNLOAD_ERROR };
 
+G_END_DECLS
+
 #endif