Project

General

Profile

« Previous | Next » 

Revision 538c276e

Added by Andreas Müller over 9 years ago

merge app-import 3.4 branch into trunk

View differences:

cdm-eflora/src/main/java/eu/etaxonomy/cdm/io/eflora/EfloraTaxonImport.java
1370 1370
		if (team == null){
1371 1371
			team = lastTeam;
1372 1372
		}
1373
		ref.setAuthorTeam(team);
1373
		ref.setAuthorship(team);
1374 1374
		
1375 1375
		TaxonDescription description = getDescription(taxon);
1376 1376
		TextData textData = TextData.NewInstance(Feature.CITATION());
......
1431 1431
				logger.error("ERROR occurred when trying to split title: " +  title + "; split[0]: + " + split[0]);
1432 1432
			}
1433 1433
			book.setTitle(title);
1434
			book.setAuthorTeam(bookTeam);
1434
			book.setAuthorship(bookTeam);
1435 1435
			book.setDatePublished(ref.getDatePublished());
1436 1436
			ref.setTitle(null);
1437 1437
			ref.setInBook(book);
......
1526 1526
			homonymName.setNomenclaturalMicroReference(homonymNomRefDetail);
1527 1527
			String authorTitle = homonymNomRef.getTitleCache();
1528 1528
			Team team = Team.NewTitledInstance(authorTitle, authorTitle);
1529
			homonymNomRef.setAuthorTeam(team);
1529
			homonymNomRef.setAuthorship(team);
1530 1530
			homonymNomRef.setTitle("");
1531 1531
			homonymNomRef.setProtectedTitleCache(false);
1532 1532
			
......
1570 1570
		if (team == null){
1571 1571
			logger.warn("Name has nom. ref. but no author team. Name: " + name.getTitleCache() + ", Nom.Ref.: " + value);
1572 1572
		}else{
1573
			nomRef.setAuthorTeam(team);
1573
			nomRef.setAuthorship(team);
1574 1574
		}
1575 1575
		return team;
1576 1576
	}

Also available in: Unified diff