Project

General

Profile

« Previous | Next » 

Revision 4e1b6f7d

Added by Andreas Müller almost 6 years ago

ref #7238 change to familyname and givenname incdmlib-app

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/EuroMedActivator.java
483 483
                }
484 484
                if (userEraabStraube.getPerson() == null){
485 485
                    Person eckhard = Person.NewInstance();
486
                    eckhard.setLastname("von Raab-Straube");
487
                    eckhard.setFirstname("Eckhard");
486
                    eckhard.setFamilyName("von Raab-Straube");
487
                    eckhard.setGivenName("Eckhard");
488 488
                    eckhard.setPrefix("Dr.");
489 489
                    userEraabStraube.setPerson(eckhard);
490 490
                }
app-import/src/main/java/eu/etaxonomy/cdm/app/bogota/BogotaChecklistActivator.java
106 106

  
107 107
        Team team = Team.NewInstance();
108 108
        Person bernal = Person.NewTitledInstance("Bernal, R.");
109
        bernal.setFirstname("R.");
110
        bernal.setLastname("Bernal");
109
        bernal.setGivenName("R.");
110
        bernal.setFamilyName("Bernal");
111 111
        Person gradstein = Person.NewTitledInstance("Gradstein, S.R.");
112
        gradstein.setFirstname("S.R.");
113
        gradstein.setLastname("Gradstein");
112
        gradstein.setGivenName("S.R.");
113
        gradstein.setFamilyName("Gradstein");
114 114
        Person celis = Person.NewTitledInstance("Celis, M.");
115
        celis.setFirstname("M.");
116
        celis.setLastname("Celis");
115
        celis.setGivenName("M.");
116
        celis.setFamilyName("Celis");
117 117
        team.addTeamMember(bernal);
118 118
        team.addTeamMember(gradstein);
119 119
        team.addTeamMember(celis);
app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusImagesActivator.java
304 304
        Matcher matcher = Pattern.compile(regEx).matcher(artist);
305 305
        Person person = Person.NewInstance();
306 306
        if (matcher.matches()){
307
            person.setFirstname(matcher.group(1).trim());
308
            person.setLastname(matcher.group(2).trim());
307
            person.setGivenName(matcher.group(1).trim());
308
            person.setFamilyName(matcher.group(2).trim());
309 309
        }else{
310 310
            person.setTitleCache(artist, true);
311 311
            logger.warn("Person could not be parsed: " + artist + " for file " + fileName);
app-import/src/main/java/eu/etaxonomy/cdm/app/greece/GreeceActivator.java
102 102
        Team team = Team.NewInstance();
103 103

  
104 104
        Person person = Person.NewInstance();
105
        person.setFirstname("P.");
106
        person.setLastname("Dimopoulos");
105
        person.setGivenName("P.");
106
        person.setFamilyName("Dimopoulos");
107 107
        team.addTeamMember(person);
108 108

  
109 109
        person = Person.NewInstance();
110
        person.setFirstname("Th.");
111
        person.setLastname("Raus");
110
        person.setGivenName("Th.");
111
        person.setFamilyName("Raus");
112 112
        team.addTeamMember(person);
113 113

  
114 114
        person = Person.NewInstance();
115
        person.setFirstname("E.");
116
        person.setLastname("Bergmeier");
115
        person.setGivenName("E.");
116
        person.setFamilyName("Bergmeier");
117 117
        team.addTeamMember(person);
118 118

  
119 119
        person = Person.NewInstance();
120
        person.setFirstname("Th.");
121
        person.setLastname("Constantinidis");
120
        person.setGivenName("Th.");
121
        person.setFamilyName("Constantinidis");
122 122
        team.addTeamMember(person);
123 123

  
124 124
        person = Person.NewInstance();
125
        person.setFirstname("G.");
126
        person.setLastname("Iatrou");
125
        person.setGivenName("G.");
126
        person.setFamilyName("Iatrou");
127 127
        team.addTeamMember(person);
128 128

  
129 129
        person = Person.NewInstance();
130
        person.setFirstname("S.");
131
        person.setLastname("Kokkini");
130
        person.setGivenName("S.");
131
        person.setFamilyName("Kokkini");
132 132
        team.addTeamMember(person);
133 133

  
134 134
        person = Person.NewInstance();
135
        person.setFirstname("A.");
136
        person.setLastname("Strid");
135
        person.setGivenName("A.");
136
        person.setFamilyName("Strid");
137 137
        team.addTeamMember(person);
138 138

  
139 139
        person = Person.NewInstance();
140
        person.setFirstname("D.");
141
        person.setLastname("Tzanoudakis");
140
        person.setGivenName("D.");
141
        person.setFamilyName("Tzanoudakis");
142 142
        team.addTeamMember(person);
143 143

  
144 144
        result.setAuthorship(team);
app-import/src/main/java/eu/etaxonomy/cdm/app/mexico/MexicoBorhidiActivator.java
103 103
        Reference result = ReferenceFactory.newGeneric();
104 104
        result.setTitle("Borhidi 2012 accepted spp checked in TROPICOS.XLSX");
105 105
        Person borhidi = Person.NewTitledInstance("Borhidi");
106
        borhidi.setFirstname("Attila");
106
        borhidi.setGivenName("Attila");
107 107
        result.setAuthorship(borhidi);
108 108
        return result;
109 109
    }
......
116 116
        result.setPages("608 pp.");
117 117
        result.setDatePublished(TimePeriodParser.parseString("2012"));
118 118
        Person borhidi = Person.NewTitledInstance("Borhidi");
119
        borhidi.setFirstname("Attila");
119
        borhidi.setGivenName("Attila");
120 120
        result.setAuthorship(borhidi);
121 121
        result.setUuid(MexicoConabioTransformer.uuidReferenceBorhidi);
122 122
        return result;
app-import/src/main/java/eu/etaxonomy/cdm/app/mexico/MexicoConabioActivator.java
121 121
        result.setTitle("Rubiáceas de México");
122 122
        result.setDatePublished(TimePeriodParser.parseString("2016"));
123 123
        Person author = Person.NewInstance();
124
        author.setFirstname("Helga");
125
        author.setLastname("Ochoterena Booth");
124
        author.setGivenName("Helga");
125
        author.setFamilyName("Ochoterena Booth");
126 126
        result.setAuthorship(author);
127 127
        result.setUuid(MexicoConabioTransformer.uuidReferenceConabio);
128 128
        return result;
app-import/src/main/java/eu/etaxonomy/cdm/app/proibiosphere/SynthesysCacheActivator.java
74 74
            Reference reference = ReferenceFactory.newGeneric();
75 75
            reference.setTitleCache("Chenopodium vulvaria observations from the Botanical Society of the British Isles", true);
76 76
            Person p = Person.NewInstance();
77
            p.setFirstname("Quentin");
78
            p.setLastname("Groom");
77
            p.setGivenName("Quentin");
78
            p.setFamilyName("Groom");
79 79
            p.addEmailAddress("qgroom@bsbi.co.uk");
80 80
            reference.setAuthorship(p);
81 81
            reference.setOrganization("Botanical Society of the British Isles");
app-import/src/main/java/eu/etaxonomy/cdm/app/redlist/GermanSLActivator.java
96 96
        Reference result = ReferenceFactory.newGeneric();
97 97
        result.setTitle("GermanSL.xslx");
98 98
        Person florian = Person.NewTitledInstance("Jansen");
99
        florian.setFirstname("Florian");
99
        florian.setGivenName("Florian");
100 100
        result.setAuthorship(florian);
101 101
        return result;
102 102
    }
......
109 109
//        result.setPages("608 pp.");
110 110
//        result.setDatePublished(TimePeriodParser.parseString("2012"));
111 111
//        Person borhidi = Person.NewTitledInstance("Borhidi");
112
//        borhidi.setFirstname("Attila");
112
//        borhidi.setGivenName("Attila");
113 113
//        result.setAuthorship(borhidi);
114 114
//        result.setUuid(MexicoConabioTransformer.uuidReferenceBorhidi);
115 115
        return result;
app-import/src/main/java/eu/etaxonomy/cdm/io/PalmaeImageImport.java
244 244
						if (metaData.containsKey(MetaData.ARTIST)){
245 245
							//TODO search for the person first and then create the object...
246 246
							artist = Person.NewTitledInstance(metaData.get(MetaData.ARTIST).replace("'", ""));
247
							artist.setFirstname(getFirstName(metaData.get(MetaData.ARTIST)).replace("'", ""));
248
							artist.setLastname(getLastName(metaData.get(MetaData.ARTIST)).replace("'", ""));
247
							artist.setGivenName(getGivenName(metaData.get(MetaData.ARTIST)).replace("'", ""));
248
							artist.setFamilyName(getFamilyName(metaData.get(MetaData.ARTIST)).replace("'", ""));
249 249

  
250 250
							IMatchStrategy matchStrategy = DefaultMatchStrategy.NewInstance(AgentBase.class);
251 251
							try{
......
266 266
							Rights copyright = Rights.NewInstance();
267 267
							copyright.setType(RightsType.COPYRIGHT());
268 268
							Person copyrightOwner;
269
							if (artist != null && !artist.getLastname().equalsIgnoreCase(getLastName(metaData.get(MetaData.COPYRIGHT)))){
269
							if (artist != null && !artist.getFamilyName().equalsIgnoreCase(getFamilyName(metaData.get(MetaData.COPYRIGHT)))){
270 270
								copyrightOwner = Person.NewInstance();
271 271

  
272
								copyrightOwner.setFirstname(getFirstName(metaData.get(MetaData.COPYRIGHT)));
273
								copyrightOwner.setLastname(getLastName(metaData.get(MetaData.COPYRIGHT)));
272
								copyrightOwner.setGivenName(getGivenName(metaData.get(MetaData.COPYRIGHT)));
273
								copyrightOwner.setFamilyName(getFamilyName(metaData.get(MetaData.COPYRIGHT)));
274 274
							}else
275 275
							{
276 276
								copyrightOwner = artist;
......
314 314
		return;
315 315
	}
316 316

  
317
	private String getFirstName(String artist){
317
	private String getGivenName(String artist){
318 318
		if (artist == null){
319 319
			return "";
320 320
		}
......
334 334
		}
335 335
	}
336 336

  
337
	private String getLastName(String artist){
337
	private String getFamilyName(String artist){
338 338

  
339 339
		if (artist.contains(",")){
340 340
			String [] artistSplits = artist.split(",");
app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelAuthorImport.java
1 1
/**
2 2
* Copyright (C) 2007 EDIT
3
* European Distributed Institute of Taxonomy 
3
* European Distributed Institute of Taxonomy
4 4
* http://www.e-taxonomy.eu
5
* 
5
*
6 6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7 7
* See LICENSE.TXT at the top of this package for the full license terms.
8 8
*/
9 9
package eu.etaxonomy.cdm.io.berlinModel.in;
10 10

  
11 11
import java.sql.ResultSet;
12
import java.sql.SQLException;
13 12
import java.util.Collection;
14 13
import java.util.HashMap;
15 14
import java.util.Map;
......
18 17
import org.apache.log4j.Logger;
19 18
import org.springframework.stereotype.Component;
20 19

  
21
import eu.etaxonomy.cdm.common.CdmUtils;
22 20
import eu.etaxonomy.cdm.io.berlinModel.in.validation.BerlinModelAuthorImportValidator;
23 21
import eu.etaxonomy.cdm.io.common.IOValidator;
24 22
import eu.etaxonomy.cdm.io.common.ImportHelper;
......
34 32
/**
35 33
 * Supported attributes:
36 34
 * - AuthorId, Abbrev, FirstName, LastName, Dates, AreaOfInterest, NomStandard, createUpdateNotes
37
 * 
35
 *
38 36
 * @author a.mueller
39 37
 * @since 20.03.2008
40
 * @version 1.0
41 38
 */
42 39
@Component
43 40
public class BerlinModelAuthorImport extends BerlinModelImportBase {
44
	private static final boolean BLANK_TO_NULL = true;
41
    private static final long serialVersionUID = 2155984573495140615L;
42

  
43
    private static final boolean BLANK_TO_NULL = true;
45 44

  
46 45
	private static final Logger logger = Logger.getLogger(BerlinModelAuthorImport.class);
47 46

  
48 47
	public static final String NAMESPACE = "Author";
49
	
48

  
50 49
//	private static int recordsPerLog = 5000;
51 50
	private static final String dbTableName = "Author";
52 51
	private static final String pluralString = "Authors";
53
	
52

  
54 53
	public BerlinModelAuthorImport(){
55 54
		super(dbTableName, pluralString);
56 55
	}
57
	
56

  
58 57
	@Override
59 58
	protected String getIdQuery(BerlinModelImportState state) {
60 59
		String result = " SELECT authorId FROM " + getTableName();
61 60
		if (StringUtils.isNotBlank(state.getConfig().getAuthorFilter())){
62
			result += " WHERE " +  state.getConfig().getAuthorFilter(); 
63
		} 
61
			result += " WHERE " +  state.getConfig().getAuthorFilter();
62
		}
64 63
		return result;
65 64
	}
66 65

  
67 66
	@Override
68 67
	protected String getRecordQuery(BerlinModelImportConfigurator config) {
69
		String strRecordQuery = 
68
		String strRecordQuery =
70 69
			" SELECT * " +
71
            " FROM " + dbTableName + " " + 
70
            " FROM " + dbTableName + " " +
72 71
            " WHERE authorId IN ( " + ID_LIST_TOKEN + " )";
73 72
		return strRecordQuery;
74 73
	}
......
77 76
	public boolean doPartition(ResultSetPartitioner partitioner, BerlinModelImportState state)  {
78 77
		String dbAttrName;
79 78
		String cdmAttrName;
80
		Map<Integer, Person> personMap = new HashMap<Integer, Person>();
81
		
79
		Map<Integer, Person> personMap = new HashMap<>();
80

  
82 81
		boolean success = true;
83 82
		ResultSet rs = partitioner.getResultSet();
84 83
		try{
85 84
			//for each author
86 85
			while (rs.next()){
87
					
86

  
88 87
			//	partitioner.doLogPerLoop(recordsPerLog, pluralString);
89
				
88

  
90 89
					//create Agent element
91 90
					int authorId = rs.getInt("AuthorId");
92
					
91

  
93 92
					Person author = Person.NewInstance();
94
					
93

  
95 94
					dbAttrName = "Abbrev";
96 95
					cdmAttrName = "nomenclaturalTitle";
97 96
					success &= ImportHelper.addStringValue(rs, author, dbAttrName, cdmAttrName, BLANK_TO_NULL);
98 97

  
99 98
					dbAttrName = "FirstName";
100
					cdmAttrName = "firstname";
99
					cdmAttrName = "givenname";
101 100
					success &= ImportHelper.addStringValue(rs, author, dbAttrName, cdmAttrName, BLANK_TO_NULL);
102
					
101

  
103 102
					dbAttrName = "LastName";
104
					cdmAttrName = "lastname";
103
					cdmAttrName = "familyname";
105 104
					success &= ImportHelper.addStringValue(rs, author, dbAttrName, cdmAttrName, BLANK_TO_NULL);
106
					
105

  
107 106
					String dates = rs.getString("dates");
108 107
					if (dates != null){
109 108
						dates.trim();
110 109
						TimePeriod lifespan = TimePeriodParser.parseString(dates);
111 110
						author.setLifespan(lifespan);
112 111
					}
113
					
112

  
114 113
//				    //AreaOfInterest
115 114
					String areaOfInterest = rs.getString("AreaOfInterest");
116 115
					if (StringUtils.isNotBlank(areaOfInterest)){
......
122 121
					if (StringUtils.isNotBlank(nomStandard)){
123 122
						Extension.NewInstance(author, nomStandard, ExtensionType.NOMENCLATURAL_STANDARD());
124 123
					}
125
					
126
					
124

  
125

  
127 126
					//initials
128 127
					String initials = null;
129 128
					for (int j = 1; j <= rs.getMetaData().getColumnCount(); j++){
......
141 140
				doIdCreatedUpdatedNotes(state, author, rs, authorId, NAMESPACE);
142 141

  
143 142
				personMap.put(authorId, author);
144
	
143

  
145 144
			} //while rs.hasNext()
146 145
			//logger.info("save " + i + " "+pluralString + " ...");
147 146
			getAgentService().save((Collection)personMap.values());
148
			
147

  
149 148
				}catch(Exception ex){
150 149
					logger.error(ex.getMessage());
151 150
					ex.printStackTrace();
......
160 159
		// no related objects exist
161 160
		return result;
162 161
	}
163
			
162

  
164 163
	@Override
165 164
	protected boolean doCheck(BerlinModelImportState state){
166 165
		IOValidator<BerlinModelImportState> validator = new BerlinModelAuthorImportValidator();
167 166
		return validator.validate(state);
168 167
	}
169
	
168

  
170 169
	@Override
171 170
	protected boolean isIgnore(BerlinModelImportState state){
172 171
		return ! state.getConfig().isDoAuthors();
app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelFactsImport.java
911 911
    private AgentBase<?> getSalvadorArtist() {
912 912
        if (salvadorArtistId == null){
913 913
            Person person = Person.NewInstance();
914
            person.setFirstname("José Gerver");
915
            person.setLastname("Molina");
914
            person.setGivenName("José Gerver");
915
            person.setFamilyName("Molina");
916 916
            salvadorArtistId = getAgentService().save(person).getId();
917 917
            return person;
918 918
        }else{
......
942 942

  
943 943
    private void makeSalvadorReferences() {
944 944
        Person walter = Person.NewTitledInstance("Berendsohn, W. G.");
945
        walter.setFirstname("Walter G.");
946
        walter.setLastname("Berendsohn");
945
        walter.setGivenName("Walter G.");
946
        walter.setFamilyName("Berendsohn");
947 947
        Person katja = Person.NewTitledInstance("Gruber, Anne Kathrina");
948
        katja.setFirstname("Anne Katharina");
949
        katja.setLastname("Gruber");
948
        katja.setGivenName("Anne Katharina");
949
        katja.setFamilyName("Gruber");
950 950
        Person monte = Person.NewTitledInstance("Monterrosa Salomón, J.");
951 951
        Person olmedo = Person.NewTitledInstance("Olmedo Galán, P.");
952 952
        Person rodriguez = Person.NewTitledInstance("Rodríguez Delcid, D");
app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelAuthorExport.java
62 62
		CdmDbExportMapping<BerlinModelExportState, BerlinModelExportConfigurator, IExportTransformer> mapping = new CdmDbExportMapping<BerlinModelExportState, BerlinModelExportConfigurator, IExportTransformer>(tableName);
63 63
		mapping.addMapper(IdMapper.NewInstance("AuthorId"));
64 64
		mapping.addMapper(DbStringMapper.NewInstance("nomenclaturalTitle", "Abbrev"));
65
		mapping.addMapper(DbStringMapper.NewInstance("firstname", "FirstName"));
66
		mapping.addMapper(DbStringMapper.NewInstance("lastname", "LastName"));
65
		mapping.addMapper(DbStringMapper.NewInstance("givenname", "FirstName"));
66
		mapping.addMapper(DbStringMapper.NewInstance("familyname", "LastName"));
67 67
		mapping.addMapper(DbTimePeriodMapper.NewInstance("lifespan", "Dates"));
68 68
		mapping.addMapper(DbExtensionMapper.NewInstance(ExtensionType.NOMENCLATURAL_STANDARD(), "NomStandard"));
69 69
		mapping.addMapper(DbExtensionMapper.NewInstance(ExtensionType.AREA_OF_INTREREST(), "AreaOfInterest"));
app-import/src/main/java/eu/etaxonomy/cdm/io/bogota/BogotaSpecimenImport.java
623 623
        }else if (collectorType.equals("Brother") || collectorType.equals("Person")){
624 624
            Person person = Person.NewInstance();
625 625
            if (collectorType.equals("Person")){
626
                person.setLastname(record.get(COL_COLLECTOR_LASTNAME));
626
                person.setFamilyName(record.get(COL_COLLECTOR_LASTNAME));
627 627
                String initials = CdmUtils.concat("", record.get(COL_COLLECTOR_FIRSTNAME), record.get(COL_COLLECTOR_MIDDLENAME));
628 628
                initials = (initials == null)? null : initials.replaceAll("\\s", "");
629 629
                person.setInitials(initials);
......
635 635
            }else{
636 636
                person.setTitleCache(collectors, true);
637 637
                person.setPrefix("Hno.");
638
                person.setFirstname(collectors.replace("Hno.", "").trim());
638
                person.setGivenName(collectors.replace("Hno.", "").trim());
639 639
            }
640 640
            collector = person;
641 641
        }else if (collectorType.equals("Group")){
......
743 743
                splits[length - 2]= splits[length - 2]+"." + splits[length - 1];
744 744
                length--;
745 745
            }
746
            String lastName = splits[length - 1];
746
            String familyName = splits[length - 1];
747 747
            String initials = null;
748 748
            for (int i= 0; i < length-1;i++){
749 749
                initials = CdmUtils.concat("", initials, splits[i]+".");
750 750
            }
751
            person.setLastname(lastName);
751
            person.setFamilyName(familyName);
752 752
            person.setInitials(initials);
753 753
            TeamOrPersonBase<?> result = getDeduplicationHelper(state).getExistingAuthor(state, person);
754 754
            return result;
app-import/src/main/java/eu/etaxonomy/cdm/io/cuba/CubaExcelImport.java
889 889
            newCombination = TaxonName.castAndDeproxy(name1);
890 890
        }
891 891
        if (matchAuthor(basionymName.getCombinationAuthorship(), newCombination.getBasionymAuthorship())
892
                && BasionymRelationCreator.matchLastNamePart(basionymName, newCombination)){
892
                && BasionymRelationCreator.matchFamilyNamePart(basionymName, newCombination)){
893 893
            newCombination.addBasionym(basionymName);
894 894
        }else{
895 895
            if ( (newCombination.getBasionyms().isEmpty() || ! onlyIfNotYetExists)
......
1108 1108
        }
1109 1109

  
1110 1110
        String[] splits = title.split("\\s+");
1111
        int nNotFirstName = isFilius ? 2 : 1;
1112
        person.setLastname(splits[splits.length - nNotFirstName] + (isFilius? " f." : ""));
1113
        person.setFirstname(CdmUtils.concat(" ", Arrays.copyOfRange(splits, 0, splits.length-nNotFirstName)));
1111
        int nNotGivenName = isFilius ? 2 : 1;
1112
        person.setFamilyName(splits[splits.length - nNotGivenName] + (isFilius? " f." : ""));
1113
        person.setGivenName(CdmUtils.concat(" ", Arrays.copyOfRange(splits, 0, splits.length-nNotGivenName)));
1114 1114
        return person;
1115 1115
    }
1116 1116

  
app-import/src/main/java/eu/etaxonomy/cdm/io/cuba/CubaVocabularyImport.java
76 76
        refAS.setUuid(CubaTransformer.uuidRefAS);
77 77
        refAS.setTitle("Catalogue of seed plants of the West Indies");
78 78
        Person acevedo = Person.NewInstance();
79
        acevedo.setFirstname("Pedro");
80
        acevedo.setLastname("Acevedo-Rodríguez");
79
        acevedo.setGivenName("Pedro");
80
        acevedo.setFamilyName("Acevedo-Rodríguez");
81 81
        Person strong = Person.NewInstance();
82
        strong.setFirstname("Mark T.");
83
        strong.setLastname("Strong");
82
        strong.setGivenName("Mark T.");
83
        strong.setFamilyName("Strong");
84 84
        Team asTeam = Team.NewInstance();
85 85
        asTeam.addTeamMember(acevedo);
86 86
        asTeam.addTeamMember(strong);
app-import/src/main/java/eu/etaxonomy/cdm/io/greece/FloraHellenicaExcludedTaxonImport.java
146 146
    private Reference makeHayek1929() {
147 147
        Reference ref = ReferenceFactory.newGeneric();
148 148
        Person hayek = Person.NewInstance();
149
        hayek.setLastname("Hayek");
149
        hayek.setFamilyName("Hayek");
150 150
        ref.setAuthorship(hayek);
151 151
        ref.setDatePublished(TimePeriod.NewInstance(1929));
152 152
        return ref;
app-import/src/main/java/eu/etaxonomy/cdm/io/greece/FloraHellenicaImageImport.java
160 160
                Person person = Person.NewInstance();
161 161
                String[] split = artistStr.split("\\+");
162 162
                if (split.length == 1){
163
                    person.setLastname(artistStr);
163
                    person.setFamilyName(artistStr);
164 164
                }else if (split.length == 2){
165
                    person.setFirstname(split[0]);
166
                    person.setLastname(split[1]);
165
                    person.setGivenName(split[0]);
166
                    person.setFamilyName(split[1]);
167 167
                }else{
168 168
                    person.setTitleCache("artistStr", true);
169 169
                }
app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioTaxonImport.java
183 183
                    result.setTitle(authorStrPart);
184 184
                }else{
185 185
                    Person person = Person.NewInstance();
186
                    person.setLastname(authorStrPart);
186
                    person.setFamilyName(authorStrPart);
187 187
                    result.setAuthorship(person);
188 188
                    state.putAgentBase(person.getTitleCache(), person);
189 189
                }
......
207 207
    private void addTeamMember(Team team, String author) {
208 208
        if (StringUtils.isNotBlank(author)){
209 209
            Person person = Person.NewInstance();
210
            person.setLastname(author.trim());
210
            person.setFamilyName(author.trim());
211 211
            team.addTeamMember(person);
212 212
        }
213 213
    }
app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/bfnXml/in/BfnXmlImportReferences.java
189 189

  
190 190
        Person person1 = Person.NewInstance();
191 191
        person1.setInitials("M.");
192
        person1.setLastname("Schnittler");
192
        person1.setFamilyName("Schnittler");
193 193
        team.addTeamMember(person1);
194 194

  
195 195
        Person person2 = Person.NewInstance();
196 196
        person2.setInitials("V.");
197
        person2.setLastname("Kummer");
197
        person2.setFamilyName("Kummer");
198 198
        team.addTeamMember(person2);
199 199

  
200 200
        Person person3 = Person.NewInstance();
201 201
        person3.setInitials("A.");
202
        person3.setLastname("Kuhnt");
202
        person3.setFamilyName("Kuhnt");
203 203
        team.addTeamMember(person3);
204 204

  
205 205
        Person person4 = Person.NewInstance();
206 206
        person4.setInitials("L.");
207
        person4.setLastname("Kriegelsteiner");
207
        person4.setFamilyName("Kriegelsteiner");
208 208
        team.addTeamMember(person4);
209 209

  
210 210
        Person person5 = Person.NewInstance();
211 211
        person5.setInitials("L.");
212
        person5.setLastname("Flatau");
212
        person5.setFamilyName("Flatau");
213 213
        team.addTeamMember(person5);
214 214

  
215 215
        Person person6 = Person.NewInstance();
216 216
        person6.setInitials("H.");
217
        person6.setLastname("Müller");
217
        person6.setFamilyName("Müller");
218 218
        team.addTeamMember(person5);
219 219

  
220 220
        Person person7 = Person.NewInstance();
221 221
        person7.setInitials("U.");
222
        person7.setLastname("Täglich");
222
        person7.setFamilyName("Täglich");
223 223
        team.addTeamMember(person7);
224 224

  
225 225
        return team;
......
253 253

  
254 254
        Person person1 = Person.NewInstance();
255 255
        person1.setInitials("V.");
256
        person1.setLastname("Wirth");
256
        person1.setFamilyName("Wirth");
257 257
        team.addTeamMember(person1);
258 258

  
259 259
        Person person2 = Person.NewInstance();
260 260
        person2.setInitials("M.");
261
        person2.setLastname("Hauck");
261
        person2.setFamilyName("Hauck");
262 262
        team.addTeamMember(person2);
263 263

  
264 264
        Person person3 = Person.NewInstance();
265 265
        person3.setInitials("W.");
266
        person3.setLastname("von Brackel");
266
        person3.setFamilyName("von Brackel");
267 267
        team.addTeamMember(person3);
268 268

  
269 269
        Person person4 = Person.NewInstance();
270 270
        person4.setInitials("R.");
271
        person4.setLastname("Cezanne");
271
        person4.setFamilyName("Cezanne");
272 272
        team.addTeamMember(person4);
273 273

  
274 274
        Person person5 = Person.NewInstance();
275 275
        person5.setInitials("U.");
276
        person5.setLastname("de Bruyn");
276
        person5.setFamilyName("de Bruyn");
277 277
        team.addTeamMember(person5);
278 278

  
279 279
        Person person6 = Person.NewInstance();
280 280
        person6.setInitials("O.");
281
        person6.setLastname("Dürhammer");
281
        person6.setFamilyName("Dürhammer");
282 282
        team.addTeamMember(person5);
283 283

  
284 284
        Person person7 = Person.NewInstance();
285 285
        person7.setInitials("M.");
286
        person7.setLastname("Eichler");
286
        person7.setFamilyName("Eichler");
287 287
        team.addTeamMember(person7);
288 288

  
289 289
        Person person8 = Person.NewInstance();
290 290
        person8.setInitials("A.");
291
        person8.setLastname("Gnüchtel");
291
        person8.setFamilyName("Gnüchtel");
292 292
        team.addTeamMember(person8);
293 293

  
294 294
        Person person9 = Person.NewInstance();
295 295
        person9.setInitials("V.");
296
        person9.setLastname("John");
296
        person9.setFamilyName("John");
297 297
        team.addTeamMember(person9);
298 298

  
299 299
        Person person10 = Person.NewInstance();
300 300
        person10.setInitials("B.");
301
        person10.setLastname("Litterski");
301
        person10.setFamilyName("Litterski");
302 302
        team.addTeamMember(person10);
303 303

  
304 304
        Person person11 = Person.NewInstance();
305 305
        person11.setInitials("V.");
306
        person11.setLastname("Otte");
306
        person11.setFamilyName("Otte");
307 307
        team.addTeamMember(person11);
308 308

  
309 309
        Person person12 = Person.NewInstance();
310 310
        person12.setInitials("U.");
311
        person12.setLastname("Schiefelbein");
311
        person12.setFamilyName("Schiefelbein");
312 312
        team.addTeamMember(person12);
313 313

  
314 314
        Person person13 = Person.NewInstance();
315 315
        person13.setInitials("P.");
316
        person13.setLastname("Scholz");
316
        person13.setFamilyName("Scholz");
317 317
        team.addTeamMember(person13);
318 318

  
319 319
        Person person14 = Person.NewInstance();
320 320
        person14.setInitials("M.");
321
        person14.setLastname("Schultz");
321
        person14.setFamilyName("Schultz");
322 322
        team.addTeamMember(person14);
323 323

  
324 324
        Person person15 = Person.NewInstance();
325 325
        person15.setInitials("R.");
326
        person15.setLastname("Stordeur");
326
        person15.setFamilyName("Stordeur");
327 327
        team.addTeamMember(person15);
328 328

  
329 329
        Person person16 = Person.NewInstance();
330 330
        person16.setInitials("T.");
331
        person16.setLastname("Feuerer");
331
        person16.setFamilyName("Feuerer");
332 332
        team.addTeamMember(person16);
333 333

  
334 334
        Person person17 = Person.NewInstance();
335 335
        person17.setInitials("D.");
336
        person17.setLastname("Heinrich");
336
        person17.setFamilyName("Heinrich");
337 337
        team.addTeamMember(person17);
338 338

  
339 339
        return team;
......
363 363
    private Person makeTeamBand3_zuenslerfalter() {
364 364
        Person person = Person.NewInstance();
365 365
        person.setInitials("M.");
366
        person.setLastname("Nuss");
366
        person.setFamilyName("Nuss");
367 367
        return person;
368 368
    }
369 369

  
......
389 389
    private Person makeTeamBand3_wespen() {
390 390
        Person person = Person.NewInstance();
391 391
        person.setInitials("C.");
392
        person.setLastname("Schmid-Egger");
392
        person.setFamilyName("Schmid-Egger");
393 393
        return person;
394 394
    }
395 395

  
......
421 421

  
422 422
        Person person1 = Person.NewInstance();
423 423
        person1.setInitials("H.");
424
        person1.setLastname("Meyer");
424
        person1.setFamilyName("Meyer");
425 425
        team.addTeamMember(person1);
426 426

  
427 427
        Person person2 = Person.NewInstance();
428 428
        person2.setInitials("R.");
429
        person2.setLastname("Wagner");
429
        person2.setFamilyName("Wagner");
430 430
        team.addTeamMember(person2);
431 431

  
432 432
        return team;
......
460 460

  
461 461
        Person person1 = Person.NewInstance();
462 462
        person1.setInitials("R.");
463
        person1.setLastname("Reinhardt");
463
        person1.setFamilyName("Reinhardt");
464 464
        team.addTeamMember(person1);
465 465

  
466 466
        Person person2 = makeBolz();
......
497 497

  
498 498
        Person person1 = Person.NewInstance();
499 499
        person1.setInitials("E.");
500
        person1.setLastname("Rennwald");
500
        person1.setFamilyName("Rennwald");
501 501
        team.addTeamMember(person1);
502 502

  
503 503
        Person person2 = Person.NewInstance();
504 504
        person2.setInitials("T.");
505
        person2.setLastname("Sobczyk");
505
        person2.setFamilyName("Sobczyk");
506 506
        team.addTeamMember(person2);
507 507

  
508 508
        Person person3 = Person.NewInstance();
509 509
        person3.setInitials("A.");
510
        person3.setLastname("Hofmann");
510
        person3.setFamilyName("Hofmann");
511 511
        team.addTeamMember(person3);
512 512

  
513 513
        return team;
......
541 541

  
542 542
        Person person1 = Person.NewInstance();
543 543
        person1.setInitials("R.");
544
        person1.setLastname("Trusch");
544
        person1.setFamilyName("Trusch");
545 545
        team.addTeamMember(person1);
546 546

  
547 547
        Person person2 = Person.NewInstance();
548 548
        person2.setInitials("J.");
549
        person2.setLastname("Gelbrecht");
549
        person2.setFamilyName("Gelbrecht");
550 550
        team.addTeamMember(person2);
551 551

  
552 552
        Person person3 = Person.NewInstance();
553 553
        person3.setInitials("A.");
554
        person3.setLastname("Schmidt");
554
        person3.setFamilyName("Schmidt");
555 555
        team.addTeamMember(person3);
556 556

  
557 557
        Person person4 = Person.NewInstance();
558 558
        person4.setInitials("C.");
559
        person4.setLastname("Schönborn");
559
        person4.setFamilyName("Schönborn");
560 560
        team.addTeamMember(person4);
561 561

  
562 562
        Person person5 = Person.NewInstance();
563 563
        person5.setInitials("H.");
564
        person5.setLastname("Schumacher");
564
        person5.setFamilyName("Schumacher");
565 565
        team.addTeamMember(person5);
566 566

  
567 567
        Person person6 = Person.NewInstance();
568 568
        person6.setInitials("H.");
569
        person6.setLastname("Wegner");
569
        person6.setFamilyName("Wegner");
570 570
        team.addTeamMember(person5);
571 571

  
572 572
        Person person7 = Person.NewInstance();
573 573
        person7.setInitials("W.");
574
        person7.setLastname("Wolf");
574
        person7.setFamilyName("Wolf");
575 575
        team.addTeamMember(person7);
576 576

  
577 577
        return team;
......
605 605

  
606 606
        Person person1 = Person.NewInstance();
607 607
        person1.setInitials("A.");
608
        person1.setLastname("Ssymank");
608
        person1.setFamilyName("Ssymank");
609 609
        team.addTeamMember(person1);
610 610

  
611 611
        Person person2 = Person.NewInstance();
612 612
        person2.setInitials("D.");
613
        person2.setLastname("Doczkal");
613
        person2.setFamilyName("Doczkal");
614 614
        team.addTeamMember(person2);
615 615

  
616 616
        Person person3 = Person.NewInstance();
617 617
        person3.setInitials("K.");
618
        person3.setLastname("Rennwald");
618
        person3.setFamilyName("Rennwald");
619 619
        team.addTeamMember(person3);
620 620

  
621 621
        Person person4 = Person.NewInstance();
622 622
        person4.setInitials("F.");
623
        person4.setLastname("Dziock");
623
        person4.setFamilyName("Dziock");
624 624
        team.addTeamMember(person4);
625 625

  
626 626
        return team;
......
657 657

  
658 658
        Person person2 = Person.NewInstance();
659 659
        person2.setInitials("H.");
660
        person2.setLastname("Bohn");
660
        person2.setFamilyName("Bohn");
661 661
        team.addTeamMember(person2);
662 662

  
663 663
        return team;
......
689 689
    private Person makeTeamBand3_raubfliegen() {
690 690
        Person ludwig = Person.NewInstance();
691 691
        ludwig.setInitials("D.");
692
        ludwig.setLastname("Wolff");
692
        ludwig.setFamilyName("Wolff");
693 693
        return ludwig;
694 694
    }
695 695

  
......
721 721

  
722 722
        Person person1 = Person.NewInstance();
723 723
        person1.setInitials("A.D.");
724
        person1.setLastname("Liston");
724
        person1.setFamilyName("Liston");
725 725
        team.addTeamMember(person1);
726 726

  
727 727
        Person person2 = Person.NewInstance();
728 728
        person2.setInitials("E.");
729
        person2.setLastname("Jansen");
729
        person2.setFamilyName("Jansen");
730 730
        team.addTeamMember(person2);
731 731

  
732 732
        Person person3 = Person.NewInstance();
733 733
        person3.setInitials("S.M.");
734
        person3.setLastname("Blank");
734
        person3.setFamilyName("Blank");
735 735
        team.addTeamMember(person3);
736 736

  
737 737
        Person person4 = Person.NewInstance();
738 738
        person4.setInitials("M.");
739
        person4.setLastname("Kraus");
739
        person4.setFamilyName("Kraus");
740 740
        team.addTeamMember(person4);
741 741

  
742 742
        Person person5 = Person.NewInstance();
743 743
        person5.setInitials("A.");
744
        person5.setLastname("Taeger");
744
        person5.setFamilyName("Taeger");
745 745
        team.addTeamMember(person5);
746 746

  
747 747
        return team;
......
775 775

  
776 776
        Person person1 = Person.NewInstance();
777 777
        person1.setInitials("D.");
778
        person1.setLastname("Matzke");
778
        person1.setFamilyName("Matzke");
779 779
        team.addTeamMember(person1);
780 780

  
781 781
        Person person2 = makeKoehlerG();
......
805 805

  
806 806
        Person person1 = Person.NewInstance();
807 807
        person1.setInitials("S.");
808
        person1.setLastname("Mass");
808
        person1.setFamilyName("Mass");
809 809
        team.addTeamMember(person1);
810 810

  
811 811
        Person person2 = Person.NewInstance();
812 812
        person2.setInitials("P.");
813
        person2.setLastname("Detzel");
813
        person2.setFamilyName("Detzel");
814 814
        team.addTeamMember(person2);
815 815

  
816 816
        Person person3 = Person.NewInstance();
817 817
        person3.setInitials("A.");
818
        person3.setLastname("Staudt");
818
        person3.setFamilyName("Staudt");
819 819
        team.addTeamMember(person3);
820 820

  
821 821
        return team;
......
838 838
    private Person makeTeamBand3_fransenfluegler() {
839 839
        Person person = Person.NewInstance();
840 840
        person.setInitials("R.");
841
        person.setLastname("zur Strassen");
841
        person.setFamilyName("zur Strassen");
842 842
        return person;
843 843
    }
844 844

  
......
870 870

  
871 871
        Person person1 = Person.NewInstance();
872 872
        person1.setInitials("V.");
873
        person1.setLastname("Wachlin");
873
        person1.setFamilyName("Wachlin");
874 874
        team.addTeamMember(person1);
875 875

  
876 876
        Person person2 = makeBolz();
......
903 903

  
904 904
        Person person1 = Person.NewInstance();
905 905
        person1.setInitials("J.");
906
        person1.setLastname("Jungbluth");
906
        person1.setFamilyName("Jungbluth");
907 907
        team.addTeamMember(person1);
908 908

  
909 909
        Person person2 = Person.NewInstance();
910 910
        person2.setInitials("D. von");
911
        person2.setLastname("Knorre");
911
        person2.setFamilyName("Knorre");
912 912
        team.addTeamMember(person2);
913 913

  
914 914
        return team;
......
942 942

  
943 943
        Person person1 = Person.NewInstance();
944 944
        person1.setInitials("P.");
945
        person1.setLastname("Westrich");
945
        person1.setFamilyName("Westrich");
946 946
        team.addTeamMember(person1);
947 947

  
948 948
        Person person2 = Person.NewInstance();
949 949
        person2.setInitials("U.");
950
        person2.setLastname("Frommer");
950
        person2.setFamilyName("Frommer");
951 951
        team.addTeamMember(person2);
952 952

  
953 953
        Person person3 = Person.NewInstance();
954 954
        person3.setInitials("K.");
955
        person3.setLastname("Mandery");
955
        person3.setFamilyName("Mandery");
956 956
        team.addTeamMember(person3);
957 957

  
958 958
        Person person4 = Person.NewInstance();
959 959
        person4.setInitials("H.");
960
        person4.setLastname("Riemann");
960
        person4.setFamilyName("Riemann");
961 961
        team.addTeamMember(person4);
962 962

  
963 963
        Person person5 = Person.NewInstance();
964 964
        person5.setInitials("H.");
965
        person5.setLastname("Ruhnke");
965
        person5.setFamilyName("Ruhnke");
966 966
        team.addTeamMember(person5);
967 967

  
968 968
        Person person6 = Person.NewInstance();
969 969
        person6.setInitials("C.");
970
        person6.setLastname("Saure");
970
        person6.setFamilyName("Saure");
971 971
        team.addTeamMember(person5);
972 972

  
973 973
        Person person7 = Person.NewInstance();
974 974
        person7.setInitials("J.");
975
        person7.setLastname("Voith");
975
        person7.setFamilyName("Voith");
976 976
        team.addTeamMember(person7);
977 977

  
978 978
        return team;
......
1004 1004
    private Person makeTeamBand3_ameisen() {
1005 1005
        Person person = Person.NewInstance();
1006 1006
        person.setInitials("B.");
1007
        person.setLastname("Seifert");
1007
        person.setFamilyName("Seifert");
1008 1008
        return person;
1009 1009
    }
1010 1010

  
......
1036 1036

  
1037 1037
        Person person1 = Person.NewInstance();
1038 1038
        person1.setInitials("R.");
1039
        person1.setLastname("Thiel");
1039
        person1.setFamilyName("Thiel");
1040 1040
        team.addTeamMember(person1);
1041 1041

  
1042 1042
        Person person2 = Person.NewInstance();
1043 1043
        person2.setInitials("H.");
1044
        person2.setLastname("Winkler");
1044
        person2.setFamilyName("Winkler");
1045 1045
        team.addTeamMember(person2);
1046 1046

  
1047 1047
        Person person3 = Person.NewInstance();
1048 1048
        person3.setInitials("U.");
1049
        person3.setLastname("Böttcher");
1049
        person3.setFamilyName("Böttcher");
1050 1050
        team.addTeamMember(person3);
1051 1051

  
1052 1052
        Person person4 = Person.NewInstance();
1053 1053
        person4.setInitials("A.");
1054
        person4.setLastname("Dänhardt");
1054
        person4.setFamilyName("Dänhardt");
1055 1055
        team.addTeamMember(person4);
1056 1056

  
1057 1057
        Person person5 = Person.NewInstance();
1058 1058
        person5.setInitials("R.");
1059
        person5.setLastname("Fricke");
1059
        person5.setFamilyName("Fricke");
1060 1060
        team.addTeamMember(person5);
1061 1061

  
1062 1062
        Person person6 = Person.NewInstance();
1063 1063
        person6.setInitials("M.");
1064
        person6.setLastname("George");
1064
        person6.setFamilyName("George");
1065 1065
        team.addTeamMember(person5);
1066 1066

  
1067 1067
        Person person7 = Person.NewInstance();
1068 1068
        person7.setInitials("M.");
1069
        person7.setLastname("Kloppmann");
1069
        person7.setFamilyName("Kloppmann");
1070 1070
        team.addTeamMember(person7);
1071 1071

  
1072 1072
        Person person8 = Person.NewInstance();
1073 1073
        person8.setInitials("T.");
1074
        person8.setLastname("Schaarschmidth");
1074
        person8.setFamilyName("Schaarschmidth");
1075 1075
        team.addTeamMember(person8);
1076 1076

  
1077 1077
        Person person9 = Person.NewInstance();
1078 1078
        person9.setInitials("C.");
1079
        person9.setLastname("Ubl");
1079
        person9.setFamilyName("Ubl");
1080 1080
        team.addTeamMember(person9);
1081 1081

  
1082 1082
        Person person10 = Person.NewInstance();
1083 1083
        person10.setInitials("R.");
1084
        person10.setLastname("Vorberg");
1084
        person10.setFamilyName("Vorberg");
1085 1085
        team.addTeamMember(person10);
1086 1086

  
1087 1087
        return team;
......
1116 1116

  
1117 1117
        Person person1 = Person.NewInstance();
1118 1118
        person1.setInitials("D.");
1119
        person1.setLastname("Schories");
1119
        person1.setFamilyName("Schories");
1120 1120
        team.addTeamMember(person1);
1121 1121

  
1122 1122
        Person person2 = Person.NewInstance();
1123 1123
        person2.setInitials("R.");
1124
        person2.setLastname("Kuhlenkamp");
1124
        person2.setFamilyName("Kuhlenkamp");
1125 1125
        team.addTeamMember(person2);
1126 1126

  
1127 1127
        Person person3 = Person.NewInstance();
1128 1128
        person3.setInitials("H.");
1129
        person3.setLastname("Schubert");
1129
        person3.setFamilyName("Schubert");
1130 1130
        team.addTeamMember(person3);
1131 1131

  
1132 1132
        Person person4 = Person.NewInstance();
1133 1133
        person4.setInitials("U.");
1134
        person4.setLastname("Selig");
1134
        person4.setFamilyName("Selig");
1135 1135
        team.addTeamMember(person4);
1136 1136

  
1137 1137
        return team;
......
1165 1165

  
1166 1166
        Person person1 = Person.NewInstance();
1167 1167
        person1.setInitials("E.");
1168
        person1.setLastname("Rachor");
1168
        person1.setFamilyName("Rachor");
1169 1169
        team.addTeamMember(person1);
1170 1170

  
1171 1171
        Person person2 = Person.NewInstance();
1172 1172
        person2.setInitials("R.");
1173
        person2.setLastname("Bönsch");
1173
        person2.setFamilyName("Bönsch");
1174 1174
        team.addTeamMember(person2);
1175 1175

  
1176 1176
        Person person3 = Person.NewInstance();
1177 1177
        person3.setInitials("K.");
1178
        person3.setLastname("Boos");
1178
        person3.setFamilyName("Boos");
1179 1179
        team.addTeamMember(person3);
1180 1180

  
1181 1181
        Person person4 = Person.NewInstance();
1182 1182
        person4.setInitials("F.");
1183
        person4.setLastname("Gosselck");
1183
        person4.setFamilyName("Gosselck");
1184 1184
        team.addTeamMember(person4);
1185 1185

  
1186 1186
        Person person5 = Person.NewInstance();
1187 1187
        person5.setInitials("M.");
1188
        person5.setLastname("Grotjahn");
1188
        person5.setFamilyName("Grotjahn");
1189 1189
        team.addTeamMember(person5);
1190 1190

  
1191 1191
        Person person6 = Person.NewInstance();
1192 1192
        person6.setInitials("C.-P.");
1193
        person6.setLastname("Günter");
1193
        person6.setFamilyName("Günter");
1194 1194
        team.addTeamMember(person5);
1195 1195

  
1196 1196
        Person person7 = Person.NewInstance();
1197 1197
        person7.setInitials("M.");
1198
        person7.setLastname("Gusky");
1198
        person7.setFamilyName("Gusky");
1199 1199
        team.addTeamMember(person7);
1200 1200

  
1201 1201
        Person person8 = Person.NewInstance();
1202 1202
        person8.setInitials("L.");
1203
        person8.setLastname("Gutow");
1203
        person8.setFamilyName("Gutow");
1204 1204
        team.addTeamMember(person8);
1205 1205

  
1206 1206
        Person person9 = Person.NewInstance();
1207 1207
        person9.setInitials("W.");
1208
        person9.setLastname("Heiber");
1208
        person9.setFamilyName("Heiber");
1209 1209
        team.addTeamMember(person9);
1210 1210

  
1211 1211
        Person person10 = Person.NewInstance();
1212 1212
        person10.setInitials("P.");
1213
        person10.setLastname("Jantschik");
1213
        person10.setFamilyName("Jantschik");
1214 1214
        team.addTeamMember(person10);
1215 1215

  
1216 1216
        Person person11 = Person.NewInstance();
1217 1217
        person11.setInitials("H.-J.");
1218
        person11.setLastname("Krieg");
1218
        person11.setFamilyName("Krieg");
1219 1219
        team.addTeamMember(person11);
1220 1220

  
1221 1221
        Person person12 = Person.NewInstance();
1222 1222
        person12.setInitials("R.");
1223
        person12.setLastname("Krone");
1223
        person12.setFamilyName("Krone");
1224 1224
        team.addTeamMember(person12);
1225 1225

  
1226 1226
        Person person13 = Person.NewInstance();
1227 1227
        person13.setInitials("P.");
1228
        person13.setLastname("Nehmer");
1228
        person13.setFamilyName("Nehmer");
1229 1229
        team.addTeamMember(person13);
1230 1230

  
1231 1231
        Person person14 = Person.NewInstance();
1232 1232
        person14.setInitials("K.");
1233
        person14.setLastname("Reichert");
1233
        person14.setFamilyName("Reichert");
1234 1234
        team.addTeamMember(person14);
1235 1235

  
1236 1236
        Person person15 = Person.NewInstance();
1237 1237
        person15.setInitials("H.");
1238
        person15.setLastname("Reiss");
1238
        person15.setFamilyName("Reiss");
1239 1239
        team.addTeamMember(person15);
1240 1240

  
1241 1241
        Person person16 = Person.NewInstance();
1242 1242
        person16.setInitials("A.");
1243
        person16.setLastname("Schröder");
1243
        person16.setFamilyName("Schröder");
1244 1244
        team.addTeamMember(person16);
1245 1245

  
1246 1246
        Person person17 = Person.NewInstance();
1247 1247
        person17.setInitials("J.");
1248
        person17.setLastname("Witt");
1248
        person17.setFamilyName("Witt");
1249 1249
        team.addTeamMember(person17);
1250 1250

  
1251 1251
        Person person18 = Person.NewInstance();
1252 1252
        person18.setInitials("M.L.");
1253
        person18.setLastname("Zettler");
1253
        person18.setFamilyName("Zettler");
1254 1254
        team.addTeamMember(person18);
1255 1255

  
1256 1256
        return team;
......
1282 1282
    private Person makeTeamBand1_suessfische() {
1283 1283
        Person person = Person.NewInstance();
1284 1284
        person.setInitials("J.");
1285
        person.setLastname("Freyhof");
1285
        person.setFamilyName("Freyhof");
1286 1286
        return person;
1287 1287
    }
1288 1288

  
......
1314 1314

  
1315 1315
        Person person1 = Person.NewInstance();
1316 1316
        person1.setInitials("H.");
1317
        person1.setLastname("Meinig");
1317
        person1.setFamilyName("Meinig");
1318 1318
        team.addTeamMember(person1);
1319 1319

  
1320 1320
        Person person2 = makeBoye();
......
1322 1322

  
1323 1323
        Person person3 = Person.NewInstance();
1324 1324
        person3.setInitials("R.");
1325
        person3.setLastname("Hutterer");
1325
        person3.setFamilyName("Hutterer");
1326 1326
        team.addTeamMember(person3);
1327 1327

  
1328 1328
        return team;
......
1356 1356

  
1357 1357
        Person person1 = Person.NewInstance();
1358 1358
        person1.setInitials("K.-D.");
1359
        person1.setLastname("Kühnel");
1359
        person1.setFamilyName("Kühnel");
1360 1360
        team.addTeamMember(person1);
1361 1361

  
1362 1362
        Person person2 = Person.NewInstance();
1363 1363
        person2.setInitials("A.");
1364
        person2.setLastname("Geiger");
1364
        person2.setFamilyName("Geiger");
1365 1365
        team.addTeamMember(person2);
1366 1366

  
1367 1367
        Person person3 = Person.NewInstance();
1368 1368
        person3.setInitials("H.");
1369
        person3.setLastname("Laufer");
1369
        person3.setFamilyName("Laufer");
1370 1370
        team.addTeamMember(person3);
1371 1371

  
1372 1372
        Person person4 = Person.NewInstance();
1373 1373
        person4.setInitials("R.");
1374
        person4.setLastname("Podloucky");
1374
        person4.setFamilyName("Podloucky");
1375 1375
        team.addTeamMember(person4);
1376 1376

  
1377 1377
        Person person5 = Person.NewInstance();
1378 1378
        person5.setInitials("M.");
1379
        person5.setLastname("Schlüpmann");
1379
        person5.setFamilyName("Schlüpmann");
1380 1380
        team.addTeamMember(person5);
1381 1381

  
1382 1382
        return team;
......
1432 1432

  
1433 1433
        Person person1 = Person.NewInstance();
1434 1434
        person1.setInitials("P.");
1435
        person1.setLastname("Südbeck");
1435
        person1.setFamilyName("Südbeck");
1436 1436
        team.addTeamMember(person1);
1437 1437

  
1438 1438
        Person person2 = Person.NewInstance();
1439 1439
        person2.setInitials("H.-G.");
1440
        person2.setLastname("Bauer");
1440
        person2.setFamilyName("Bauer");
1441 1441
        team.addTeamMember(person2);
1442 1442

  
1443 1443
        Person person3 = Person.NewInstance();
1444 1444
        person3.setInitials("M.");
1445
        person3.setLastname("Boschert");
1445
        person3.setFamilyName("Boschert");
1446 1446
        team.addTeamMember(person3);
1447 1447

  
1448 1448
        Person person4 = makeBoye();
......
1450 1450

  
1451 1451
        Person person5 = Person.NewInstance();
1452 1452
        person5.setInitials("W.");
1453
        person5.setLastname("Knief");
1453
        person5.setFamilyName("Knief");
1454 1454
        team.addTeamMember(person5);
1455 1455

  
1456 1456
        return team;
......
1522 1522

  
1523 1523
        Person person2 = Person.NewInstance();
1524 1524
        person2.setInitials("S.");
1525
        person2.setLastname("Balzer");
1525
        person2.setFamilyName("Balzer");
1526 1526
        team.addTeamMember(person2);
1527 1527

  
1528 1528
        Person person3 = makeBeckerN();
......
1545 1545

  
1546 1546
        Person person9 = Person.NewInstance();
1547 1547
        person9.setInitials("M.");
1548
        person9.setLastname("Strauch");
1548
        person9.setFamilyName("Strauch");
1549 1549
        team.addTeamMember(person9);
1550 1550

  
1551 1551
        return team;
......
1592 1592

  
1593 1593
        Person nehring = Person.NewInstance();
1594 1594
        nehring.setInitials("S.");
1595
        nehring.setLastname("Nehring");
1595
        nehring.setFamilyName("Nehring");
1596 1596
        team.addTeamMember(nehring);
1597 1597

  
1598 1598
        return team;
......
1638 1638

  
1639 1639
        Person otto = Person.NewInstance();
1640 1640
        otto.setInitials("C.");
1641
        otto.setLastname("Otto");
1641
        otto.setFamilyName("Otto");
1642 1642
        team.addTeamMember(otto);
1643 1643

  
1644 1644
        Person pauly = Person.NewInstance();
1645 1645
        pauly.setInitials("A.");
1646
        pauly.setLastname("Pauly");
1646
        pauly.setFamilyName("Pauly");
1647 1647
        team.addTeamMember(pauly);
1648 1648
        return team;
1649 1649
    }
......
1655 1655
    private Person makeBinotHafke() {
1656 1656
        Person binotHafke = Person.NewInstance();
1657 1657
        binotHafke.setInitials("M.");
1658
        binotHafke.setLastname("Binot-Hafke");
1658
        binotHafke.setFamilyName("Binot-Hafke");
1659 1659
        return binotHafke;
1660 1660
    }
1661 1661

  
1662 1662
    private Person makeHaupt() {
1663 1663
        Person haupt = Person.NewInstance();
1664 1664
        haupt.setInitials("H.");
1665
        haupt.setLastname("Haupt");
1665
        haupt.setFamilyName("Haupt");
1666 1666
        return haupt;
1667 1667
    }
1668 1668

  
1669 1669
    private Person makeLudwig() {
1670 1670
        Person ludwig = Person.NewInstance();
1671 1671
        ludwig.setInitials("G.");
1672
        ludwig.setLastname("Ludwig");
1672
        ludwig.setFamilyName("Ludwig");
1673 1673
        return ludwig;
1674 1674
    }
1675 1675

  
1676 1676
    private Person makeBolz() {
1677 1677
        Person person = Person.NewInstance();
1678 1678
        person.setInitials("R.");
1679
        person.setLastname("Bolz");
1679
        person.setFamilyName("Bolz");
1680 1680
        return person;
1681 1681
    }
1682 1682

  
1683 1683
    private Person makeKoehlerG() {
1684 1684
        Person person = Person.NewInstance();
1685 1685
        person.setInitials("G.");
1686
        person.setLastname("Köhler");
1686
        person.setFamilyName("Köhler");
1687 1687
        return person;
1688 1688
    }
1689 1689

  
1690 1690
    private Person makeHofbauer() {
1691 1691
        Person person = Person.NewInstance();
1692 1692
        person.setInitials("N.");
1693
        person.setLastname("Hofbauer");
1693
        person.setFamilyName("Hofbauer");
1694 1694
        return person;
1695 1695
    }
1696 1696

  
1697 1697
    private Person makeBoye() {
1698 1698
        Person person = Person.NewInstance();
1699 1699
        person.setInitials("P.");
1700
        person.setLastname("Boye");
1700
        person.setFamilyName("Boye");
1701 1701
        return person;
1702 1702
    }
1703 1703

  
1704 1704
    private Person makeBeckerN() {
1705 1705
        Person person = Person.NewInstance();
1706 1706
        person.setInitials("N.");
1707
        person.setLastname("Becker");
1707
        person.setFamilyName("Becker");
1708 1708
        return person;
1709 1709
    }
1710 1710

  
1711 1711
    private Person makeGruttkeH() {
1712 1712
        Person person = Person.NewInstance();
1713 1713
        person.setInitials("H.");
1714
        person.setLastname("Gruttke");
1714
        person.setFamilyName("Gruttke");
1715 1715
        return person;
1716 1716
    }
1717 1717

  
1718 1718
    private Person makeMatzkeHajek() {
1719 1719
        Person person = Person.NewInstance();
1720 1720
        person.setInitials("G.");
1721
        person.setLastname("Matzke-Hajek");
1721
        person.setFamilyName("Matzke-Hajek");
1722 1722
        return person;
1723 1723
    }
1724 1724

  
app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/germanSL/GermanSLTaxonImport.java
247 247
//                    result.setTitle(authorStrPart);
248 248
//                }else{
249 249
//                    Person person = Person.NewInstance();
250
//                    person.setLastname(authorStrPart);
250
//                    person.setFamilyName(authorStrPart);
251 251
//                    result.setAuthorship(person);
252 252
//                    state.putAgentBase(person.getTitleCache(), person);
253 253
//                }
app-import/src/main/java/eu/etaxonomy/cdm/io/salvador/SalvadorSpecimenImport.java
578 578
                + "Quezada|Romero|Ruíz|Sandoval|Serrano|Vásquez|Cabrera|Calderón)";
579 579

  
580 580
        if (matcher.matches()){
581
            String lastname = matcher.group(1);
582
            result.setLastname(lastname);
581
            String familyname = matcher.group(1);
582
            result.setFamilyName(familyname);
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff