* Better conversion of friendly name to fully qualified vcard name

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index ad34bf8543cb33e9fa82e0904ef83943196c70b2..2e63a74a62acf0346c3ffa884172863d5414c617 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 614.85  2004/03/16 22:44:15  ajc
+ * Better conversion of friendly name to fully qualified vcard name
+
  Revision 614.84  2004/03/16 21:09:37  ajc
  * Eliminate EVT_OUTPUTMSG server extensions (don't need them anymore)
  * Add EVT_NEWUSER server extensions
@@ -5546,4 +5549,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/serv_vcard.c b/citadel/serv_vcard.c
index 3db7f3d028f00a892ee9e4c5ea58a80bdc1bed5d..2689056eb97a6bd54fcb8fac35aa9c1cbe3754d0 100644 (file)
--- a/citadel/serv_vcard.c
+++ b/citadel/serv_vcard.c
@@ -639,16 +639,59 @@ void cmd_greg(char *argbuf)
 void vcard_newuser(struct ctdluser *usbuf) {
        char buf[SIZ];
        char vname[SIZ];
+
+       char lastname[SIZ];
+       char firstname[SIZ];
+       char middlename[SIZ];
+       char honorific_prefixes[SIZ];
+       char honorific_suffixes[SIZ];
+
        struct vCard *v;
        int i;
-       int vnum;
 
        /* Try to intelligently convert the screen name to a
         * fully expanded vCard name based on the number of
         * words in the name
         */
-       vnum = num_tokens(usbuf->fullname, ' ');
-       strcpy(vname, usbuf->fullname); /* FIXME */
+       strcpy(lastname, "");
+       strcpy(firstname, "");
+       strcpy(middlename, "");
+       strcpy(honorific_prefixes, "");
+       strcpy(honorific_suffixes, "");
+
+       strcpy(buf, usbuf->fullname);
+
+       /* Honorific suffixes */
+       if (num_tokens(buf, ',') > 1) {
+               extract_token(honorific_suffixes, buf, (num_tokens(buf, ' ') - 1), ',');
+               remove_token(buf, (num_tokens(buf, ',') - 1), ',');
+       }
+
+       /* Find a last name */
+       extract_token(lastname, buf, (num_tokens(buf, ' ') - 1), ' ');
+       remove_token(buf, (num_tokens(buf, ' ') - 1), ' ');
+
+       /* Find honorific prefixes */
+       if (num_tokens(buf, ' ') > 2) {
+               extract_token(honorific_prefixes, buf, 0, ' ');
+               remove_token(buf, 0, ' ');
+       }
+
+       /* Find a middle name */
+       if (num_tokens(buf, ' ') > 1) {
+               extract_token(middlename, buf, (num_tokens(buf, ' ') - 1), ' ');
+               remove_token(buf, (num_tokens(buf, ' ') - 1), ' ');
+       }
+
+       /* Anything left is probably the first name */
+       strcpy(firstname, buf);
+       striplt(firstname);
+
+       /* Compose the structured name */
+       sprintf(vname, "%s;%s;%s;%s;%s", lastname, firstname, middlename,
+               honorific_prefixes, honorific_suffixes);
+
+       lprintf(CTDL_DEBUG, "Converted <%s> to <%s>\n", usbuf->fullname, vname);
 
        /* Create and save the vCard */
         v = vcard_new();
@@ -657,6 +700,7 @@ void vcard_newuser(struct ctdluser *usbuf) {
        for (i=0; i<strlen(buf); ++i) {
                if (buf[i] == ' ') buf[i] = '_';
        }
+       vcard_add_prop(v, "fn", usbuf->fullname);
        vcard_add_prop(v, "n", vname);
        vcard_add_prop(v, "email;internet", buf);
        vcard_write_user(usbuf, v);