2 |
|
// |
3 |
|
// Douglas Thrift |
4 |
|
// |
5 |
< |
// $Id: IndividualClient.cxx,v 1.7 2003/08/22 06:30:14 douglas Exp $ |
5 |
> |
// $Id: IndividualClient.cxx,v 1.8 2003/08/24 07:31:45 douglas Exp $ |
6 |
|
|
7 |
|
#include "IndividualClient.h" |
8 |
|
|
9 |
|
unsigned IndividualClient::getNumber(void) |
10 |
|
{ |
11 |
< |
if (number == 0) |
11 |
> |
if (number == 0 && file != "") |
12 |
|
{ |
13 |
|
demunge(); |
14 |
|
} |
18 |
|
|
19 |
|
string IndividualClient::getName(void) |
20 |
|
{ |
21 |
< |
if (name == "") |
21 |
> |
if (name == "" && file != "") |
22 |
|
{ |
23 |
|
demunge(); |
24 |
|
} |
28 |
|
|
29 |
|
string IndividualClient::getFile(void) |
30 |
|
{ |
31 |
< |
if (file == "") |
31 |
> |
if (file == "" && number != 0 && name != "") |
32 |
|
{ |
33 |
|
ostringstream file; |
34 |
|
|
132 |
|
{ |
133 |
|
capitalize(word, 3); |
134 |
|
} |
135 |
< |
else if (word.length() > 2 && word.find("o\'") == 0) |
135 |
> |
else if (word.length() > word.find_first_of("\'-") + 1 && |
136 |
> |
word.find_first_not_of("\'-") != string::npos) |
137 |
|
{ |
138 |
< |
capitalize(word, 2); |
138 |
> |
capitalize(word, word.find_first_of("\'-") + 1); |
139 |
|
} |
140 |
|
else if (word.length() > 1) |
141 |
|
{ |
144 |
|
capitalize(word, 1); |
145 |
|
} |
146 |
|
} |
147 |
+ |
else if (word == "lefevre") |
148 |
+ |
{ |
149 |
+ |
capitalize(word, 2); |
150 |
+ |
} |
151 |
|
|
152 |
|
capitalize(word); |
153 |
|
|