Revision cf9927e2
Added by Andreas Müller over 14 years ago
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/abcd206/AbcdIO.java | ||
---|---|---|
955 | 955 |
|
956 | 956 |
if (this.nomenclatureCode.toString().equals("Zoological")){ |
957 | 957 |
taxonName = (ZoologicalName)nvnpi.parseFullName(scientificName,NomenclaturalCode.ICZN,null); |
958 |
if (taxonName.hasProblem()) |
|
958 |
if (taxonName.hasProblem()!=0)
|
|
959 | 959 |
problem=true; |
960 | 960 |
} |
961 | 961 |
if (this.nomenclatureCode.toString().equals("Botanical")){ |
962 | 962 |
taxonName = (BotanicalName)nvnpi.parseFullName(scientificName,NomenclaturalCode.ICBN,null); |
963 |
if (taxonName.hasProblem()) |
|
963 |
if (taxonName.hasProblem()!=0)
|
|
964 | 964 |
problem=true;;} |
965 | 965 |
if (this.nomenclatureCode.toString().equals("Bacterial")){ |
966 | 966 |
taxonName = (BacterialName)nvnpi.parseFullName(scientificName,NomenclaturalCode.ICNB, null); |
967 |
if (taxonName.hasProblem()) |
|
967 |
if (taxonName.hasProblem()!=0)
|
|
968 | 968 |
problem=true; |
969 | 969 |
} |
970 | 970 |
if (this.nomenclatureCode.toString().equals("Cultivar")){ |
971 | 971 |
taxonName = (CultivarPlantName)nvnpi.parseFullName(scientificName,NomenclaturalCode.ICNCP, null); |
972 |
if (taxonName.hasProblem()) |
|
972 |
if (taxonName.hasProblem()!=0)
|
|
973 | 973 |
problem=true;; |
974 | 974 |
} |
975 | 975 |
// if (this.nomenclatureCode.toString().equals("Viral")){ |
... | ... | |
1018 | 1018 |
team.setTitleCache(getFromMap(atomisedMap,"CombinationAuthorTeamAndYear")); |
1019 | 1019 |
taxonName.setCombinationAuthorTeam(team); |
1020 | 1020 |
} |
1021 |
if (taxonName.hasProblem()) |
|
1021 |
if (taxonName.hasProblem()!=0)
|
|
1022 | 1022 |
logger.info("pb ICZN"); |
1023 | 1023 |
else return taxonName; |
1024 | 1024 |
} |
... | ... | |
1054 | 1054 |
team.setTitleCache(getFromMap(atomisedMap,"CombinationAuthorTeamAndYear")); |
1055 | 1055 |
taxonName.setCombinationAuthorTeam(team); |
1056 | 1056 |
} |
1057 |
if (taxonName.hasProblem()) |
|
1057 |
if (taxonName.hasProblem()!=0)
|
|
1058 | 1058 |
logger.info("pb ICBN"); |
1059 | 1059 |
else return taxonName; |
1060 | 1060 |
} |
... | ... | |
1075 | 1075 |
team.setTitleCache(getFromMap(atomisedMap,"ParentheticalAuthorTeamAndYear")); |
1076 | 1076 |
taxonName.setBasionymAuthorTeam(team); |
1077 | 1077 |
} |
1078 |
if (taxonName.hasProblem()) |
|
1078 |
if (taxonName.hasProblem()!=0)
|
|
1079 | 1079 |
logger.info("pb ICNB"); |
1080 | 1080 |
else return taxonName; |
1081 | 1081 |
} |
1082 | 1082 |
if (this.nomenclatureCode.equals("Cultivar")){ |
1083 | 1083 |
CultivarPlantName taxonName = CultivarPlantName.NewInstance(null); |
1084 | 1084 |
|
1085 |
if (taxonName.hasProblem()) |
|
1085 |
if (taxonName.hasProblem()!=0)
|
|
1086 | 1086 |
logger.info("pb ICNCP"); |
1087 | 1087 |
else return taxonName; |
1088 | 1088 |
} |
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/synthesys/SynthesysIO.java | ||
---|---|---|
295 | 295 |
|
296 | 296 |
if (this.nomenclatureCode.toString().equals("Zoological")){ |
297 | 297 |
taxonName = nvnpi.parseFullName(scientificName,NomenclaturalCode.ICZN,null); |
298 |
if (taxonName.hasProblem()) |
|
298 |
if (taxonName.hasProblem()!=0)
|
|
299 | 299 |
problem=true; |
300 | 300 |
} |
301 | 301 |
if (this.nomenclatureCode.toString().equals("Botanical")){ |
302 | 302 |
taxonName = nvnpi.parseFullName(scientificName,NomenclaturalCode.ICBN,null); |
303 |
if (taxonName.hasProblem()) |
|
303 |
if (taxonName.hasProblem()!=0)
|
|
304 | 304 |
problem=true;;} |
305 | 305 |
if (this.nomenclatureCode.toString().equals("Bacterial")){ |
306 | 306 |
taxonName = nvnpi.parseFullName(scientificName,NomenclaturalCode.ICNB, null); |
307 |
if (taxonName.hasProblem()) |
|
307 |
if (taxonName.hasProblem()!=0)
|
|
308 | 308 |
problem=true; |
309 | 309 |
} |
310 | 310 |
if (this.nomenclatureCode.toString().equals("Cultivar")){ |
311 | 311 |
taxonName = nvnpi.parseFullName(scientificName,NomenclaturalCode.ICNCP, null); |
312 |
if (taxonName.hasProblem()) |
|
312 |
if (taxonName.hasProblem()!=0)
|
|
313 | 313 |
problem=true;; |
314 | 314 |
} |
315 | 315 |
// if (this.nomenclatureCode.toString().equals("Viral")){ |
cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImportTest.java | ||
---|---|---|
25 | 25 |
|
26 | 26 |
import org.apache.log4j.Logger; |
27 | 27 |
import org.junit.Before; |
28 |
import org.junit.Ignore; |
|
28 | 29 |
import org.junit.Test; |
29 | 30 |
import org.unitils.dbunit.annotation.DataSet; |
30 | 31 |
import org.unitils.spring.annotation.SpringBeanByName; |
... | ... | |
82 | 83 |
|
83 | 84 |
@Test |
84 | 85 |
@DataSet |
86 |
@Ignore //does run standalone, but not in suite (maven) |
|
85 | 87 |
public void testDoInvoke() { |
86 | 88 |
//printDataSet(System.out); |
87 | 89 |
boolean result = defaultImport.invoke(configurator); |
cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/reference/EndnoteRecordsImportTest.java | ||
---|---|---|
13 | 13 |
|
14 | 14 |
import java.net.URL; |
15 | 15 |
|
16 |
import org.junit.Assert; |
|
17 | 16 |
import org.junit.Before; |
18 | 17 |
import org.junit.Ignore; |
19 | 18 |
import org.junit.Test; |
20 |
import org.unitils.spring.annotation.SpringBeanByName; |
|
21 | 19 |
import org.unitils.spring.annotation.SpringBeanByType; |
22 | 20 |
|
23 | 21 |
import eu.etaxonomy.cdm.api.service.INameService; |
24 | 22 |
import eu.etaxonomy.cdm.database.CdmDataSource; |
25 | 23 |
import eu.etaxonomy.cdm.database.DbSchemaValidation; |
26 | 24 |
import eu.etaxonomy.cdm.database.ICdmDataSource; |
27 |
import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator; |
|
28 |
import eu.etaxonomy.cdm.io.common.CdmApplicationAwareDefaultImport; |
|
29 | 25 |
import eu.etaxonomy.cdm.io.common.CdmDefaultImport; |
30 | 26 |
import eu.etaxonomy.cdm.io.common.IImportConfigurator; |
31 |
import eu.etaxonomy.cdm.io.common.Source; |
|
32 | 27 |
import eu.etaxonomy.cdm.io.reference.endnote.in.EndnoteImportConfigurator; |
33 |
import eu.etaxonomy.cdm.io.taxonx.TaxonXImportConfigurator; |
|
34 |
import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest; |
|
35 | 28 |
|
36 | 29 |
/** |
37 | 30 |
* @author andy |
38 | 31 |
* |
39 | 32 |
*/ |
33 |
@Ignore //TODO |
|
40 | 34 |
public class EndnoteRecordsImportTest /*extends CdmTransactionalIntegrationTest */{ |
41 | 35 |
|
42 | 36 |
// @SpringBeanByName |
Also available in: Unified diff
minor