[elpa] externals/ebdb 41912b9 11/15: Improve check for field existence during snarf collapsing

[Eric Abrahamsen]

branch: externals/ebdb
commit 41912b992473ea25b13a0d620bf72ba027baef3c
Author: Eric Abrahamsen <address@hidden>
Commit: Eric Abrahamsen <address@hidden>

    Improve check for field existence during snarf collapsing
    
    * ebdb-snarf.el (ebdb-snarf-collapse): Instead of looking for an
      ebdb-string match for an existing field, use the higher-level
      `ebdb-record-search'. This should end up being a bit smarter about
      knowing when a record already has a field.
---
 ebdb-snarf.el | 41 ++++++++++++++++++-----------------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/ebdb-snarf.el b/ebdb-snarf.el
index d307f23..fa892fd 100644
--- a/ebdb-snarf.el
+++ b/ebdb-snarf.el
@@ -265,29 +265,24 @@ vectors, usually to `ebdb-snarf-query'."
                             (append fields names)))))
            (setq record rec)))
        (if record
-           (let (slot)
-             (dolist (f fields)
-               (condition-case nil
-                   (progn
-                     (setq slot (car (ebdb-record-field-slot-query
-                                      (eieio-object-class record)
-                                      `(nil . ,(eieio-object-class f)))))
-                     ;; Make sure that record can accept field, and doesn't
-                     ;; already have it.
-                     (unless
-                         (when (setq slot-val (ignore-errors
-                                                (ebdb-record-field record 
slot)))
-                           (member (ebdb-string f)
-                                   (mapcar #'ebdb-string
-                                           (if (listp slot-val)
-                                               slot-val
-                                             (list slot-val)))))
-                       (push f out-fields)))
-                 (ebdb-unacceptable-field nil)))
-             (dolist (name names)
-               (unless (ebdb-record-search
-                        record 'ebdb-field-name (ebdb-string name))
-                 (push name out-names))))
+           (dolist (f fields)
+             (condition-case nil
+                 (progn
+                   ;; Make sure that record can accept field, and doesn't
+                   ;; already have it.
+                   (when (and (car-safe (ebdb-record-field-slot-query
+                                         (eieio-object-class record)
+                                         `(nil . ,(eieio-object-class f))))
+                              (null (ebdb-record-search
+                                     record
+                                     (eieio-object-class f)
+                                     (ebdb-string f))))
+                     (push f out-fields)))
+               (ebdb-unacceptable-field nil)))
+         (dolist (name names)
+           (unless (ebdb-record-search
+                    record 'ebdb-field-name (ebdb-string name))
+             (push name out-names)))
          (setq out-names names
                out-fields fields))
        (push (vector record out-names out-fields) output)))