diff lisp/net/eudcb-ldap.el @ 42570:78a4068d960a

Remove unnecessary whitespaces.
author Pavel Janík <Pavel@Janik.cz>
date Sun, 06 Jan 2002 15:08:06 +0000
parents ede718edd19b
children fcac9cd201ad
line wrap: on
line diff
--- a/lisp/net/eudcb-ldap.el	Sun Jan 06 15:06:14 2002 +0000
+++ b/lisp/net/eudcb-ldap.el	Sun Jan 06 15:08:06 2002 +0000
@@ -24,7 +24,7 @@
 ;; Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
-;;    This library provides specific LDAP protocol support for the 
+;;    This library provides specific LDAP protocol support for the
 ;;    Emacs Unified Directory Client package
 
 ;;; Installation:
@@ -53,31 +53,31 @@
     (phone . telephonenumber))
   "Alist mapping EUDC attribute names to LDAP names.")
 
-(eudc-protocol-set 'eudc-query-function 'eudc-ldap-simple-query-internal 
+(eudc-protocol-set 'eudc-query-function 'eudc-ldap-simple-query-internal
 		   'ldap)
 (eudc-protocol-set 'eudc-list-attributes-function 'eudc-ldap-get-field-list
 		   'ldap)
-(eudc-protocol-set 'eudc-protocol-attributes-translation-alist 
+(eudc-protocol-set 'eudc-protocol-attributes-translation-alist
 		   'eudc-ldap-attributes-translation-alist 'ldap)
-(eudc-protocol-set 'eudc-bbdb-conversion-alist 
-		   'eudc-ldap-bbdb-conversion-alist 
+(eudc-protocol-set 'eudc-bbdb-conversion-alist
+		   'eudc-ldap-bbdb-conversion-alist
 		   'ldap)
 (eudc-protocol-set 'eudc-protocol-has-default-query-attributes nil 'ldap)
-(eudc-protocol-set 'eudc-attribute-display-method-alist 
+(eudc-protocol-set 'eudc-attribute-display-method-alist
 		   '(("jpegphoto" . eudc-display-jpeg-inline)
 		     ("labeledurl" . eudc-display-url)
 		     ("audio" . eudc-display-sound)
 		     ("labeleduri" . eudc-display-url)
-		     ("url" . eudc-display-url)) 
+		     ("url" . eudc-display-url))
 		   'ldap)
-(eudc-protocol-set 'eudc-switch-to-server-hook 
-		   '(eudc-ldap-check-base) 
+(eudc-protocol-set 'eudc-switch-to-server-hook
+		   '(eudc-ldap-check-base)
 		   'ldap)
 
 (defun eudc-ldap-cleanup-record-simple (record)
   "Do some cleanup in a RECORD to make it suitable for EUDC."
-  (mapcar 
-   (function 
+  (mapcar
+   (function
     (lambda (field)
       (cons (intern (car field))
 	    (if (cdr (cdr field))
@@ -92,8 +92,8 @@
 ;;   Make the record a cons-cell instead of a list if the it's single-valued
 ;;   Filter the $ character in addresses into \n if not done by the LDAP lib
 (defun eudc-ldap-cleanup-record-filtering-addresses (record)
-  (mapcar 
-   (function 
+  (mapcar
+   (function
     (lambda (field)
       (let ((name (intern (car field)))
 	    (value (cdr field)))
@@ -107,9 +107,9 @@
 
 (defun eudc-ldap-simple-query-internal (query &optional return-attrs)
   "Query the LDAP server with QUERY.
-QUERY is a list of cons cells (ATTR . VALUE) where ATTRs should be valid 
-LDAP attribute names.  
-RETURN-ATTRS is a list of attributes to return, defaulting to 
+QUERY is a list of cons cells (ATTR . VALUE) where ATTRs should be valid
+LDAP attribute names.
+RETURN-ATTRS is a list of attributes to return, defaulting to
 `eudc-default-return-attributes'."
   (let ((result (ldap-search (eudc-ldap-format-query-as-rfc1558 query)
 			     eudc-server
@@ -118,7 +118,7 @@
 	final-result)
     (if (or (not (boundp 'ldap-ignore-attribute-codings))
 	    ldap-ignore-attribute-codings)
-	(setq result 
+	(setq result
 	      (mapcar 'eudc-ldap-cleanup-record-filtering-addresses result))
       (setq result (mapcar 'eudc-ldap-cleanup-record-simple result)))
 
@@ -128,9 +128,9 @@
 	(setq result (eudc-filter-partial-records result return-attrs)))
     ;; Apply eudc-duplicate-attribute-handling-method
     (if (not (eq 'list eudc-duplicate-attribute-handling-method))
-	(mapcar 
+	(mapcar
 	 (function (lambda (record)
-		     (setq final-result 
+		     (setq final-result
 			   (append (eudc-filter-duplicate-attributes record)
 				   final-result))))
 	 result))
@@ -143,12 +143,12 @@
   (interactive)
   (or eudc-server
       (call-interactively 'eudc-set-server))
-  (let ((ldap-host-parameters-alist 
+  (let ((ldap-host-parameters-alist
 	 (list (cons eudc-server
 		     '(scope subtree sizelimit 1)))))
     (mapcar 'eudc-ldap-cleanup-record
-	    (ldap-search 
-	     (eudc-ldap-format-query-as-rfc1558 
+	    (ldap-search
+	     (eudc-ldap-format-query-as-rfc1558
 	      (list (cons "objectclass"
 			  (or objectclass
 			      "person"))))
@@ -156,13 +156,13 @@
 
 (defun eudc-ldap-escape-query-special-chars (string)
   "Value is STRING with characters forbidden in LDAP queries escaped."
-;; Note that * should also be escaped but in most situations I suppose 
+;; Note that * should also be escaped but in most situations I suppose
 ;; the user doesn't want this
   (eudc-replace-in-string
    (eudc-replace-in-string
     (eudc-replace-in-string
-      (eudc-replace-in-string 
-       string 
+      (eudc-replace-in-string
+       string
        "\\\\" "\\5c")
       "(" "\\28")
      ")" "\\29")
@@ -170,16 +170,16 @@
 
 (defun eudc-ldap-format-query-as-rfc1558 (query)
   "Format the EUDC QUERY list as a RFC1558 LDAP search filter."
-  (format "(&%s)" 
-	  (apply 'concat 
+  (format "(&%s)"
+	  (apply 'concat
 		 (mapcar '(lambda (item)
-			    (format "(%s=%s)" 
-				    (car item) 
+			    (format "(%s=%s)"
+				    (car item)
 				    (eudc-ldap-escape-query-special-chars (cdr item))))
 			 query))))
 
 
-;;}}}        
+;;}}}
 
 ;;{{{      High-level interfaces (interactive functions)
 
@@ -196,11 +196,11 @@
     ;; If the server is not in ldap-host-parameters-alist we add it for the
     ;; user
     (if (null (assoc eudc-server ldap-host-parameters-alist))
-	(setq ldap-host-parameters-alist 
+	(setq ldap-host-parameters-alist
 	      (cons (list eudc-server) ldap-host-parameters-alist)))
     (customize-variable 'ldap-host-parameters-alist)))
 
-;;;}}}
+;;}}}
 
 
 (eudc-register-protocol 'ldap)