packages/excorporate: Retrieve Services.wsdl directly

[gnu-emacs-elpa] / packages / excorporate / excorporate.el

diff --git a/packages/excorporate/excorporate.el b/packages/excorporate/excorporate.el
index 69585d69a58c202c299973ae8e5f3528ec9c3727..c32f7980e6de125aafe9f3ba935a69426d458308 100644 (file)
--- a/packages/excorporate/excorporate.el
+++ b/packages/excorporate/excorporate.el
@@ -451,8 +451,10 @@ the FSM should transition to on success."
     (:unrecoverable-error
      (list :shutting-down-on-error state-data nil))
     (:retrieve-xml
-     (let ((service-url (plist-get state-data :service-url)))
-       (url-retrieve (concat service-url "?wsdl")
+     (let* ((service-url (plist-get state-data :service-url))
+           (wsdl-url (replace-regexp-in-string "/[^/]*$" "/Services.wsdl"
+                                               service-url)))
+       (url-retrieve wsdl-url
                     (lambda (status)
                       (let ((data-buffer (current-buffer)))
                         (unwind-protect
@@ -460,7 +462,7 @@ the FSM should transition to on success."
                                 (progn
                                   (plist-put state-data :failure-message
                                              (format "Failed to retrieve %s"
-                                                     service-url))
+                                                     wsdl-url))
                                   (fsm-send fsm :unrecoverable-error))
                               (plist-put state-data
                                          :service-xml
@@ -649,7 +651,9 @@ OPTIONAL-INVITEES, a list of strings representing optional participants."
                                   end 'dateTime)))
             (location (cdr (assoc 'Location calendar-item)))
             (to-invitees (cdr (assoc 'DisplayTo calendar-item)))
-            (main-invitees (mapcar 'org-trim (split-string to-invitees ";")))
+            (main-invitees (when to-invitees
+                             (mapcar 'org-trim
+                                     (split-string to-invitees ";"))))
             (cc-invitees (cdr (assoc 'DisplayCc calendar-item)))
             (optional-invitees (when cc-invitees
                                  (mapcar 'org-trim