Revision e26fd740
Added by Andreas Müller almost 4 years ago
| cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java | ||
|---|---|---|
| 635 | 635 |
* but the name itself is NOT deduplicated (this may change in future) |
| 636 | 636 |
* @return |
| 637 | 637 |
*/ |
| 638 |
public TaxonName parseName(String taxonNameString, NomenclaturalCode code, Rank preferredRank, boolean doDeduplicate);
|
|
| 638 |
public UpdateResult parseName(String taxonNameString, NomenclaturalCode code, Rank preferredRank, boolean doDeduplicate);
|
|
| 639 | 639 |
|
| 640 |
public TaxonName parseName(TaxonName nameToBeFilled, String stringToBeParsed, Rank preferredRank, boolean doEmpty, boolean doDeduplicate);
|
|
| 640 |
public UpdateResult parseName(TaxonName nameToBeFilled, String stringToBeParsed, Rank preferredRank, boolean doEmpty, boolean doDeduplicate);
|
|
| 641 | 641 |
|
| 642 | 642 |
} |
| cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java | ||
|---|---|---|
| 1155 | 1155 |
} |
| 1156 | 1156 |
|
| 1157 | 1157 |
@Override |
| 1158 |
public TaxonName parseName(String stringToBeParsed, NomenclaturalCode code, Rank preferredRank, boolean doDeduplicate) {
|
|
| 1158 |
public UpdateResult parseName(String stringToBeParsed, NomenclaturalCode code, Rank preferredRank, boolean doDeduplicate) {
|
|
| 1159 | 1159 |
TaxonName name = TaxonNameFactory.NewNameInstance(code, preferredRank); |
| 1160 | 1160 |
return parseName(name, stringToBeParsed, preferredRank, true, doDeduplicate); |
| 1161 | 1161 |
} |
| 1162 | 1162 |
|
| 1163 | 1163 |
@Override |
| 1164 |
public TaxonName parseName(TaxonName nameToBeFilled, String stringToBeParsed, Rank preferredRank, boolean doEmpty, boolean doDeduplicate){
|
|
| 1164 |
public UpdateResult parseName(TaxonName nameToBeFilled, String stringToBeParsed, Rank preferredRank, boolean doEmpty, boolean doDeduplicate){
|
|
| 1165 |
UpdateResult result = new UpdateResult(); |
|
| 1165 | 1166 |
NonViralNameParserImpl nonViralNameParser = NonViralNameParserImpl.NewInstance(); |
| 1166 | 1167 |
nonViralNameParser.parseReferencedName(nameToBeFilled, stringToBeParsed, preferredRank, doEmpty); |
| 1167 | 1168 |
TaxonName name = nameToBeFilled; |
| ... | ... | |
| 1225 | 1226 |
throw new RuntimeException(e); |
| 1226 | 1227 |
} |
| 1227 | 1228 |
} |
| 1228 |
return name; |
|
| 1229 |
result.setCdmEntity(name); |
|
| 1230 |
return result; |
|
| 1229 | 1231 |
} |
| 1230 | 1232 |
|
| 1231 | 1233 |
|
| cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java | ||
|---|---|---|
| 822 | 822 |
name = nameService.load(taxonDto.getNameUuid()); |
| 823 | 823 |
|
| 824 | 824 |
}else{
|
| 825 |
name = nameService.parseName(taxonDto.getTaxonNameString(),
|
|
| 825 |
UpdateResult tmpResult = nameService.parseName(taxonDto.getTaxonNameString(),
|
|
| 826 | 826 |
taxonDto.getCode(), taxonDto.getPreferredRank(), true); |
| 827 |
result.addUpdatedObjects(tmpResult.getUpdatedObjects()); |
|
| 828 |
name = (TaxonName)tmpResult.getCdmEntity(); |
|
| 827 | 829 |
} |
| 828 | 830 |
Reference sec = null; |
| 829 | 831 |
if (taxonDto.getSecUuid() != null ){
|
Also available in: Unified diff
ref #9078 adapt return type of service.parseName