packages/excorporate: Change server version lookup

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

diff --git a/packages/excorporate/excorporate.el b/packages/excorporate/excorporate.el
index 80f3c33bdcb1390ba2743d310a6b72a3af2f7227..8168dd38b97950e77116e68c1ac29f17f0b2a250 100644 (file)
--- a/packages/excorporate/excorporate.el
+++ b/packages/excorporate/excorporate.el
@@ -5,7 +5,7 @@
 ;; Author: Thomas Fitzsimmons <fitzsim@fitzsim.org>
 ;; Maintainer: Thomas Fitzsimmons <fitzsim@fitzsim.org>
 ;; Created: 2014-09-19
-;; Version: 0.7.0
+;; Version: 0.7.1
 ;; Keywords: calendar
 ;; Homepage: https://www.fitzsim.org/blog/
 ;; Package-Requires: ((emacs "24.1") (fsm "0.2") (soap-client "3.0.2") (url-http-ntlm "2.0.2"))
@@ -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
@@ -495,18 +497,27 @@ the FSM should transition to on success."
 
 (defun exco--get-server-version (wsdl)
   "Extract server version from WSDL."
-  (catch 'found
-    (dolist (attribute
-            (soap-xs-type-attributes
-             (soap-xs-element-type
-              (soap-wsdl-get
-               '("http://schemas.microsoft.com/exchange/services/2006/types"
-                 . "RequestServerVersion")
-               wsdl 'soap-xs-element-p))))
-      (when (equal (soap-xs-attribute-name attribute) "Version")
-       (throw 'found (soap-xs-attribute-default attribute))))
-    (warn "Excorporate: Failed to determine server version")
-    nil))
+  (let ((warning-message "Excorporate: Failed to determine server version")
+       (namespace "http://schemas.microsoft.com/exchange/services/2006/types")
+       (name "RequestServerVersion")
+       (found-version nil))
+    (unwind-protect
+       (setq found-version
+             (catch 'found
+               (dolist (attribute
+                        (soap-xs-type-attributes
+                         (soap-xs-element-type (soap-wsdl-get
+                                                `(,namespace . ,name)
+                                                wsdl 'soap-xs-element-p))))
+                 (when (equal (soap-xs-attribute-name attribute) "Version")
+                   (throw 'found (car (soap-xs-simple-type-enumeration
+                                       (soap-xs-attribute-type attribute))))))
+               (warn warning-message)
+               nil))
+      (if found-version
+         found-version
+       (warn warning-message)
+       nil))))
 
 (define-enter-state exco--fsm :retrieving-data
   (_fsm state-data)
@@ -649,7 +660,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