Hide Expedia view mode when expedia is not built in.

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

diff --git a/src/googlesearch.c b/src/googlesearch.c
index f8c58cf68d50c188d9ef1e3a9a2077c529fec982..5a6fccb2e6d15ff1dd09f9fcb207c5d59f0d7046 100644 (file)
--- a/src/googlesearch.c
+++ b/src/googlesearch.c
@@ -27,20 +27,23 @@
 #include "curl_download.h"
 
 #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_PATTERN_1 "{center:{lat:"
+#define GOOGLE_SEARCH_PATTERN_2 ",lng:"
+#define GOOGLE_SEARCH_NOT_FOUND "around this map area did not match any locations"
 
 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/", 0 };
+
 gchar * a_googlesearch_get_search_string_for_this_place(VikWindow *vw)
 {
   if (!last_coord)
     return NULL;
 
   VikViewport *vvp = vik_window_viewport(vw);
-  VikCoord *cur_center = vik_viewport_get_center(vvp);
+  const VikCoord *cur_center = vik_viewport_get_center(vvp);
   if (vik_coord_equals(cur_center, last_coord)) {
     return(last_successful_search_str);
   }
@@ -119,6 +122,11 @@ static gboolean parse_file_for_latlon(gchar *file_name, struct LatLon *ll)
   len = g_mapped_file_get_length(mf);
   text = g_mapped_file_get_contents(mf);
 
+  if (g_strstr_len(text, len, GOOGLE_SEARCH_NOT_FOUND) != NULL) {
+    found = FALSE;
+    goto done;
+  }
+
   if ((pat = g_strstr_len(text, len, GOOGLE_SEARCH_PATTERN_1)) == NULL) {
     found = FALSE;
     goto done;
@@ -196,7 +204,7 @@ static int google_search_get_coord(VikWindow *vw, VikViewport *vvp, gchar *srch_
 
   escaped_srch_str = uri_escape(srch_str);
 
-  if ((tmp_fd = g_file_open_tmp (NULL, &tmpname, NULL)) == -1) {
+  if ((tmp_fd = g_file_open_tmp ("vikgsearch.XXXXXX", &tmpname, NULL)) == -1) {
     g_critical("couldn't open temp file\n");
     exit(1);
   }
@@ -206,8 +214,7 @@ static int google_search_get_coord(VikWindow *vw, VikViewport *vvp, gchar *srch_
   uri = g_strdup_printf(GOOGLE_SEARCH_URL_FMT, escaped_srch_str);
 
   /* TODO: curl may not be available */
-  if (curl_download_uri(uri, tmp_file)) {  /* error */
-    fprintf(stderr, "DEBUG: %s() download error\n", __PRETTY_FUNCTION__);
+  if (curl_download_uri(uri, tmp_file, &googlesearch_options)) {  /* error */
     fclose(tmp_file);
     ret = -1;
     goto done;