[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.1 emacs/lisp/net/eudcb-ph.el:1.2
*** emacs/lisp/net/eudcb-ph.el:1.1      Wed Jan 12 15:47:52 2000
--- emacs/lisp/net/eudcb-ph.el  Sun Jan  6 10:08:06 2002
***************
*** 24,30 ****
  ;; Boston, MA 02111-1307, USA.
  
  ;;; Commentary:
! ;;    This library provides specific CCSO PH/QI protocol support for the 
  ;;    Emacs Unified Directory Client package
  
  ;;; Code:
--- 24,30 ----
  ;; Boston, MA 02111-1307, USA.
  
  ;;; Commentary:
! ;;    This library provides specific CCSO PH/QI protocol support for the
  ;;    Emacs Unified Directory Client package
  
  ;;; Code:
***************
*** 50,57 ****
  
  (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 
! and/or cons cells (KEY . VALUE) where KEYs should be valid 
  CCSO database keys.  NAME is equivalent to (DEFAULT . NAME),
  where DEFAULT is the default key of the database.
  RETURN-FIELDS is a list of database fields to return,
--- 50,57 ----
  
  (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
! and/or cons cells (KEY . VALUE) where KEYs should be valid
  CCSO database keys.  NAME is equivalent to (DEFAULT . NAME),
  where DEFAULT is the default key of the database.
  RETURN-FIELDS is a list of database fields to return,
***************
*** 61,67 ****
        (setq return-fields eudc-default-return-attributes))
      (if (eq 'all return-fields)
        (setq return-fields '(all)))
!     (setq request 
          (concat "query "
                  (if (stringp query)
                      query
--- 61,67 ----
        (setq return-fields eudc-default-return-attributes))
      (if (eq 'all return-fields)
        (setq return-fields '(all)))
!     (setq request
          (concat "query "
                  (if (stringp query)
                      query
***************
*** 88,96 ****
  
  
  (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."
!   (let (record 
        records
        line-regexp
        current-key
--- 88,96 ----
  
  
  (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."
!   (let (record
        records
        line-regexp
        current-key
***************
*** 122,128 ****
                               (intern (match-string 2)))
                    value (match-string 3))
              (if (and current-key
!                      (eq key current-key)) 
                  (setq key nil)
                (setq current-key key))
              (if (or (null fields)
--- 122,128 ----
                               (intern (match-string 2)))
                    value (match-string 3))
              (if (and current-key
!                      (eq key current-key))
                  (setq key nil)
                (setq current-key key))
              (if (or (null fields)
***************
*** 156,162 ****
          (message "Contacting server...")
          (setq process (eudc-ph-open-session))
          (if process
!             (save-excursion 
                (set-buffer (setq buffer (process-buffer process)))
                (eudc-ph-send-command process request)
                (message "Request sent, waiting for reply...")
--- 156,162 ----
          (message "Contacting server...")
          (setq process (eudc-ph-open-session))
          (if process
!             (save-excursion
                (set-buffer (setq buffer (process-buffer process)))
                (eudc-ph-send-command process request)
                (message "Request sent, waiting for reply...")
***************
*** 164,170 ****
        (if process
          (eudc-ph-close-session process)))
      buffer))
!         
  (defun eudc-ph-open-session (&optional server)
    "Open a connection to the given CCSO/QI SERVER.
  SERVER is either a string naming the server or a list (NAME PORT)."
--- 164,170 ----
        (if process
          (eudc-ph-close-session process)))
      buffer))
! 
  (defun eudc-ph-open-session (&optional server)
    "Open a connection to the given CCSO/QI SERVER.
  SERVER is either a string naming the server or a list (NAME PORT)."
***************
*** 232,238 ****
          (buffer-substring (point) match-end)
        return-code))))
  
! ;;}}}        
  
  ;;{{{      High-level interfaces (interactive functions)
  
--- 232,238 ----
          (buffer-substring (point) match-end)
        return-code))))
  
! ;;}}}
  
  ;;{{{      High-level interfaces (interactive functions)