Fix parallel build (make -j8) on multi-processor machines. Based on a patch from...

[andy/viking.git] / src / googlesearch.c

diff --git a/src/googlesearch.c b/src/googlesearch.c
index 7c9cbc1f81561180636681ede05ea2fcc35cc322..b7c7a72970c719c4cf10261a2eea3d3ef63994d6 100644 (file)
--- a/src/googlesearch.c
+++ b/src/googlesearch.c
@@ -19,9 +19,16 @@
  *
  * Created by Quy Tonthat <qtonthat@gmail.com>
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
+#include <glib.h>
+#include <glib/gstdio.h>
 #include <glib/gprintf.h>
+#include <glib/gi18n.h>
 
 #include "viking.h"
 #include "curl_download.h"
@@ -29,13 +36,13 @@
 #define GOOGLE_SEARCH_URL_FMT "http://maps.google.com/maps?q=%s&output=js"
 #define GOOGLE_SEARCH_PATTERN_1 "{center:{lat:"
 #define GOOGLE_SEARCH_PATTERN_2 ",lng:"
-#define GOOGLE_SEARCH_NOT_FOUND "around this map area did not match any locations"
+#define GOOGLE_SEARCH_NOT_FOUND "not understand the location"
 
 static gchar *last_search_str = NULL;
 static VikCoord *last_coord = NULL;
 static gchar *last_successful_search_str = NULL;
 
-static DownloadOptions googlesearch_options = { "http://maps.google.com/" };
+static DownloadOptions googlesearch_options = { "http://maps.google.com/", 0, a_check_map_file };
 
 gchar * a_googlesearch_get_search_string_for_this_place(VikWindow *vw)
 {
@@ -57,9 +64,9 @@ static gboolean prompt_try_again(VikWindow *vw)
   gboolean ret = TRUE;
 
   dialog = gtk_dialog_new_with_buttons ( "", GTK_WINDOW(vw), 0, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL );
-  gtk_window_set_title(GTK_WINDOW(dialog), "Search");
+  gtk_window_set_title(GTK_WINDOW(dialog), _("Search"));
 
-  GtkWidget *search_label = gtk_label_new("I don't know that place. Do you want another search?");
+  GtkWidget *search_label = gtk_label_new(_("I don't know that place. Do you want another search?"));
   gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), search_label, FALSE, FALSE, 5 );
   gtk_widget_show_all(dialog);
 
@@ -75,9 +82,9 @@ static gchar *  a_prompt_for_search_string(VikWindow *vw)
   GtkWidget *dialog = NULL;
 
   dialog = gtk_dialog_new_with_buttons ( "", GTK_WINDOW(vw), 0, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL );
-  gtk_window_set_title(GTK_WINDOW(dialog), "Search");
+  gtk_window_set_title(GTK_WINDOW(dialog), _("Search"));
 
-  GtkWidget *search_label = gtk_label_new("Enter address or place name:");
+  GtkWidget *search_label = gtk_label_new(_("Enter address or place name:"));
   GtkWidget *search_entry = gtk_entry_new();
   if (last_search_str)
     gtk_entry_set_text(GTK_ENTRY(search_entry), last_search_str);
@@ -116,7 +123,7 @@ static gboolean parse_file_for_latlon(gchar *file_name, struct LatLon *ll)
   lat_buf[0] = lon_buf[0] = '\0';
 
   if ((mf = g_mapped_file_new(file_name, FALSE, NULL)) == NULL) {
-    g_critical("couldn't map temp file\n");
+    g_critical(_("couldn't map temp file"));
     exit(1);
   }
   len = g_mapped_file_get_length(mf);
@@ -188,8 +195,9 @@ gchar *uri_escape(gchar *str)
       dst += 3;
     }
   }
+  *dst = '\0';
 
-    return(esc_str);
+  return(esc_str);
 }
 
 static int google_search_get_coord(VikWindow *vw, VikViewport *vvp, gchar *srch_str, VikCoord *coord)
@@ -202,10 +210,14 @@ static int google_search_get_coord(VikWindow *vw, VikViewport *vvp, gchar *srch_
   int ret = 0;  /* OK */
   struct LatLon ll;
 
+  g_debug("%s: raw search: %s", __FUNCTION__, srch_str);
+
   escaped_srch_str = uri_escape(srch_str);
 
+  g_debug("%s: escaped search: %s", __FUNCTION__, escaped_srch_str);
+
   if ((tmp_fd = g_file_open_tmp ("vikgsearch.XXXXXX", &tmpname, NULL)) == -1) {
-    g_critical("couldn't open temp file\n");
+    g_critical(_("couldn't open temp file"));
     exit(1);
   }
 
@@ -216,11 +228,13 @@ static int google_search_get_coord(VikWindow *vw, VikViewport *vvp, gchar *srch_
   /* TODO: curl may not be available */
   if (curl_download_uri(uri, tmp_file, &googlesearch_options)) {  /* error */
     fclose(tmp_file);
+    tmp_file = NULL;
     ret = -1;
     goto done;
   }
 
   fclose(tmp_file);
+  tmp_file = NULL;
   if (!parse_file_for_latlon(tmpname, &ll)) {
     ret = -1;
     goto done;
@@ -239,7 +253,7 @@ static int google_search_get_coord(VikWindow *vw, VikViewport *vvp, gchar *srch_
 done:
   g_free(escaped_srch_str);
   g_free(uri);
-  remove(tmpname);
+  g_remove(tmpname);
   g_free(tmpname);
   return ret;
 }