[Emacs-diffs] Changes to emacs/lisp/net/eudcb-ph.el

[Pavel Janík]

Index: emacs/lisp/net/eudcb-ph.el
diff -c emacs/lisp/net/eudcb-ph.el:1.4 emacs/lisp/net/eudcb-ph.el:1.5
*** emacs/lisp/net/eudcb-ph.el:1.4      Tue Jan  8 01:58:13 2002
--- emacs/lisp/net/eudcb-ph.el  Wed Jan 16 03:16:01 2002
***************
*** 24,37 ****
  ;; Boston, MA 02111-1307, USA.
  
  ;;; Commentary:
  ;;    This library provides specific CCSO PH/QI protocol support for the
! ;;    Emacs Unified Directory Client package
  
  ;;; Code:
  
  (require 'eudc)
  
- 
  ;;{{{      Internal cooking
  
  (eudc-protocol-set 'eudc-bbdb-conversion-alist 'eudc-ph-bbdb-conversion-alist 
'ph)
--- 24,37 ----
  ;; Boston, MA 02111-1307, USA.
  
  ;;; Commentary:
+ 
  ;;    This library provides specific CCSO PH/QI protocol support for the
! ;;    Emacs Unified Directory Client package.
  
  ;;; Code:
  
  (require 'eudc)
  
  ;;{{{      Internal cooking
  
  (eudc-protocol-set 'eudc-bbdb-conversion-alist 'eudc-ph-bbdb-conversion-alist 
'ph)
***************
*** 45,53 ****
  (defconst eudc-ph-default-server-port 105
    "Default TCP port for CCSO PH/QI directory services.")
  
- 
- 
- 
  (defun eudc-ph-query-internal (query &optional return-fields)
    "Query the PH/QI server with QUERY.
  QUERY can be a string NAME or a list made of strings NAME
--- 45,50 ----
***************
*** 86,92 ****
        (eudc-ph-parse-query-result)
      (mapcar 'eudc-caar (eudc-ph-parse-query-result))))
  
- 
  (defun eudc-ph-parse-query-result (&optional fields)
    "Return a list of alists of key/values from in `eudc-ph-process-buffer'.
  Fields not in FIELDS are discarded."
--- 83,88 ----
***************
*** 140,150 ****
             (setq record (if (not (eq 'list 
eudc-duplicate-attribute-handling-method))
                              (eudc-filter-duplicate-attributes record)
                            (list record)))
!            (setq records (append record records))))
!       )
      (message "Done")
!     records)
!   )
  
  (defun eudc-ph-do-request (request)
    "Send REQUEST to the server.
--- 136,144 ----
             (setq record (if (not (eq 'list 
eudc-duplicate-attribute-handling-method))
                              (eudc-filter-duplicate-attributes record)
                            (list record)))
!            (setq records (append record records)))))
      (message "Done")
!     records))
  
  (defun eudc-ph-do-request (request)
    "Send REQUEST to the server.
***************
*** 192,206 ****
        (process-kill-without-query process)
        process)))
  
- 
  (defun eudc-ph-close-session (process)
    (save-excursion
      (set-buffer (process-buffer process))
      (eudc-ph-send-command process "quit")
      (eudc-ph-read-response process)
!     (if (fboundp 'add-async-timeout)
!       (add-async-timeout 10 'delete-process process)
!       (run-at-time 2 nil 'delete-process process))))
  
  (defun eudc-ph-send-command (process command)
    (goto-char (point-max))
--- 186,197 ----
        (process-kill-without-query process)
        process)))
  
  (defun eudc-ph-close-session (process)
    (save-excursion
      (set-buffer (process-buffer process))
      (eudc-ph-send-command process "quit")
      (eudc-ph-read-response process)
!     (run-at-time 2 nil 'delete-process process)))
  
  (defun eudc-ph-send-command (process command)
    (goto-char (point-max))
***************
*** 248,254 ****
    (eudc-set-server server 'ph))
  
  ;;}}}
- 
  
  (eudc-register-protocol 'ph)
  
--- 239,244 ----