From 9d787e1c74797a988d8eed2adf7d03509e275a47 Mon Sep 17 00:00:00 2001 From: mar Date: Wed, 20 May 1992 12:07:11 +0000 Subject: [PATCH] also look for names ending in II and V --- lib/fixname.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/lib/fixname.c b/lib/fixname.c index 9f931eef..5e7266ce 100644 --- a/lib/fixname.c +++ b/lib/fixname.c @@ -23,7 +23,7 @@ void FixName(ilnm, ifnm, last, first, middle) char *ilnm, *ifnm; char *first, *last, *middle; { - int ends_jr=0, ends_iii=0, ends_iv=0; + int ends_jr=0, ends_iii=0, ends_iv=0, ends_ii=0, ends_v=0; Upcase(ilnm); Upcase(ifnm); @@ -31,7 +31,7 @@ void FixName(ilnm, ifnm, last, first, middle) /* Last name ... */ TrimTrailingSpace(ilnm); - LookForJrAndIII(ilnm, &ends_jr, &ends_iii, &ends_iv); + LookForJrAndIII(ilnm, &ends_jr, &ends_ii, &ends_iii, &ends_iv, &ends_v); LookForSt(ilnm); LookForO(ilnm); FixCase(ilnm); @@ -40,14 +40,14 @@ void FixName(ilnm, ifnm, last, first, middle) /* First name & middle initial ... */ TrimTrailingSpace(ifnm); - LookForJrAndIII(ifnm, &ends_jr, &ends_iii, &ends_iv); + LookForJrAndIII(ifnm, &ends_jr, &ends_ii, &ends_iii, &ends_iv, &ends_v); GetMidInit(ifnm, middle); FixCase(ifnm); #ifdef notdef /* okay, finish up first name */ - AppendJrOrIII(ifnm, &ends_jr, &ends_iii, &ends_iv); + AppendJrOrIII(ifnm, &ends_jr, &ends_ii, &ends_iii, &ends_iv, &ends_v); #endif notdef strncpy(first, ifnm, FIRST_LEN); } @@ -70,11 +70,13 @@ register char *p; } } -LookForJrAndIII(nm, pends_jr, pends_iii, pends_iv) +LookForJrAndIII(nm, pends_jr, pends_ii, pends_iii, pends_iv, pends_v) register char *nm; register int *pends_jr; +int *pends_ii; register int *pends_iii; register int *pends_iv; +int *pends_v; { register int len = strlen(nm); @@ -94,6 +96,14 @@ register int *pends_iv; *pends_iii = 1; nm[len - 4] = '\0'; } + else if (len >= 4 && !strcmp(nm + len - 3, " II")) { + *pends_ii = 1; + nm[len - 3] = '\0'; + } + else if (len >= 3 && !strcmp(nm + len - 2, " V")) { + *pends_v = 1; + nm[len - 2] = '\0'; + } } LookForSt(nm) /* ST PIERRE, etc. */ -- 2.45.2