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/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;

Also available in: Unified diff