[elpa] externals/ebdb 57e31ef 2/3: Allow migration of organization records, other migration fixes

[Eric Abrahamsen]

branch: externals/ebdb
commit 57e31ef18bae3dec22d126eb989f87aae9178213
Author: Eric Abrahamsen <eric@ericabrahamsen.net>
Commit: Eric Abrahamsen <eric@ericabrahamsen.net>

    Allow migration of organization records, other migration fixes
    
    * ebdb-migrate.el (ebdb-migrate-vector-to-class): If we're migrating
    an organization, we need to use a different class of name field. And
    don't try to add akas to organizations. Also fix the check for the url
    field parser, and don't create a mail-alias field if the record has no
    mails.
---
 ebdb-migrate.el | 58 +++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 36 insertions(+), 22 deletions(-)

diff --git a/ebdb-migrate.el b/ebdb-migrate.el
index 1153eb9..bdb5116 100644
--- a/ebdb-migrate.el
+++ b/ebdb-migrate.el
@@ -466,11 +466,19 @@ BBDB sets the default of that option."
        (uuid (aref v 9))
        (c-date (aref v 10))
        (ts (aref v 11))
-       name akas phones mails addresses fields notes lab val)
-    (setq name (make-instance ebdb-default-name-class
-                             :surname l-name
-                             :given-names (when f-name (split-string f-name " 
" nil))
-                             :affix affix))
+       name akas phones mails addresses fields notes lab val
+       instance)
+    (setq name (if (child-of-class-p ebdb-default-record-class
+                                    'ebdb-record-person)
+                  (make-instance
+                   ebdb-default-name-class
+                   :surname l-name
+                   :given-names (when f-name (split-string f-name " " nil))
+                   :affix affix)
+                (make-instance 'ebdb-field-name-simple
+                               :name (if f-name
+                                         (concat f-name " " l-name)
+                                       l-name))))
     (when aka
       (dolist (a aka)
        (push (make-instance ebdb-default-name-class
@@ -551,11 +559,12 @@ BBDB sets the default of that option."
              val (cdr x))
        (cond
         ((eq lab 'mail-alias)
-         (push (make-instance 'ebdb-field-mail-alias
-                              :alias val
-                              :address (car-safe mails))
-               fields))
-        ((and (stringp v)
+         (when mails
+           (push (make-instance 'ebdb-field-mail-alias
+                                :alias val
+                                :address (car-safe mails))
+                 fields)))
+        ((and (stringp val)
               (string-match-p val url-handler-regexp))
          (push (make-instance 'ebdb-field-url
                               :url val)
@@ -608,18 +617,23 @@ BBDB sets the default of that option."
                               :label (symbol-name (car x))
                               :value val)
                fields)))))
-    (make-instance ebdb-default-record-class
-                  :name name
-                  :uuid uuid
-                  :aka akas
-                  :phone phones
-                  :address addresses
-                  :mail mails
-                  :timestamp ts
-                  :creation-date c-date
-                  :notes notes
-                  :dirty t
-                  :fields fields)))
+    (setq instance
+         (make-instance ebdb-default-record-class
+                        :name name
+                        :uuid uuid
+                        :phone phones
+                        :address addresses
+                        :mail mails
+                        :timestamp ts
+                        :creation-date c-date
+                        :notes notes
+                        :dirty t
+                        :fields fields))
+    (when akas
+      (condition-case nil
+         (setf (slot-value instance 'aka) akas)
+       (invalid-slot-type nil)))
+    instance))
 
 (defun ebdb-migrate-parse-records ()
   "Parse an earlier (non-EIEIO) version of a BBDB database file."