* update quotes

[lib.git] / emacs_el / google-weather.el

diff --git a/emacs_el/google-weather.el b/emacs_el/google-weather.el
index d86165d23d781fee5c871ec19252734ecb713ce7..be09e34cc4ed2a92d13fce8ee9ac4056cbc29814 100644 (file)
--- a/emacs_el/google-weather.el
+++ b/emacs_el/google-weather.el
@@ -31,13 +31,20 @@
 (require 'xml)
 (require 'time-date)
 
+(eval-when-compile
+  (require 'cl))
+
 (defgroup google-weather nil
   "Google Weather."
   :group 'comm)
 
+(defcustom google-weather-use-https t
+  "Default protocol to use to access the Google Weather API."
+  :group 'google-weather)
+
 (defconst google-weather-url
-  "http://www.google.com/ig/api"
-  "URL used to access the Google Weather API.")
+  "www.google.com/ig/api"
+  "URL of the Google Weather API.")
 
 (defconst google-weather-image-url
   "http://www.google.com"
@@ -57,7 +64,7 @@
              (if cache-time
                  (time-less-p
                   (time-add
-                   (url-is-cached url)
+                   cache-time
                    (seconds-to-time expire-time))
                   (current-time))
                t)))))
@@ -83,7 +90,8 @@ to 0 force a cache renewal."
          data)
     (with-current-buffer buffer
       (goto-char (point-min))
-      (search-forward "\n\n")
+      (unless (search-forward "\n\n" nil t)
+        (error "Data not found"))
       (decode-coding-region
        (point) (point-max)
        (detect-coding-region (point) (point-max) t))
@@ -96,7 +104,7 @@ to 0 force a cache renewal."
 
 (defun google-weather-build-url (location &optional language)
   "Build URL to retrieve weather for LOCATION in LANGUAGE."
-  (concat google-weather-url "?weather=" (url-hexify-string location)
+  (concat "http" (when google-weather-use-https "s") "://" google-weather-url "?weather=" (url-hexify-string location)
           (when language
             (concat "&hl=" language))))
 
@@ -115,7 +123,7 @@ See `google-weather-retrieve-data' for the use of EXPIRE-TIME."
   (cddr (assoc 'forecast_information (google-weather-data->weather data))))
 
 (defun google-weather-assoc (key data)
-  "Do some sort of magic 'assoc to find fields in DATA."
+  "Extract value of field KEY from DATA."
   (cdr (assoc 'data (cadr (assoc key data)))))
 
 (defun google-weather-data->city (data)
@@ -125,19 +133,19 @@ See `google-weather-retrieve-data' for the use of EXPIRE-TIME."
    (google-weather-data->forecast-information data)))
 
 (defun google-weather-data->postal-code (data)
-  "Return the postal code where the data come from."
+  "Return the postal code where the DATA come from."
   (google-weather-assoc
    'postal_code
    (google-weather-data->forecast-information data)))
 
 (defun google-weather-data->unit-system (data)
-  "Return the unit system used for data."
+  "Return the unit system used for DATA."
   (google-weather-assoc
    'unit_system
    (google-weather-data->forecast-information data)))
 
 (defun google-weather-data->forecast-date (data)
-  "Return the unit system used for data."
+  "Return the unit system used for DATA."
   (google-weather-assoc
    'forecast_date
    (google-weather-data->forecast-information data)))
@@ -168,12 +176,14 @@ See `google-weather-retrieve-data' for the use of EXPIRE-TIME."
 
 (defun google-weather-data->forecast-for-date (data date)
   "Return forecast for DATE from DATA.
-DATE should be in the same format used by calendar i.e. (MONTH DAY YEAR)."
-  (cdr (assoc date
-              (google-weather-data->forecast data))))
+DATE should be in the same format used by calendar,
+i.e. (MONTH DAY YEAR)."
+  (cdr (assoc date (google-weather-data->forecast data))))
 
 (defun google-weather-data->temperature-symbol (data)
-  "Return the temperature to be used according to `google-weather-unit-system-temperature-assoc' in DATA."
+  "Return the temperature to be used according in DATA.
+It uses `google-weather-unit-system-temperature-assoc' to find a
+match."
   (cdr (assoc (google-weather-data->unit-system data) google-weather-unit-system-temperature-assoc)))
 
 (provide 'google-weather)