Revision c911c118
Added by Andreas Müller almost 4 years ago
app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonRelationImport.java | ||
---|---|---|
56 | 56 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
57 | 57 |
import eu.etaxonomy.cdm.model.taxon.TaxonBase; |
58 | 58 |
import eu.etaxonomy.cdm.model.taxon.TaxonNode; |
59 |
import eu.etaxonomy.cdm.model.taxon.TaxonNodeStatus; |
|
59 | 60 |
import eu.etaxonomy.cdm.model.taxon.TaxonRelationship; |
60 | 61 |
import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType; |
61 | 62 |
import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException; |
... | ... | |
757 | 758 |
relQualifierFk == TAX_REL_IS_PARTIAL_HETEROTYPIC_SYNONYM_OF |
758 | 759 |
){ |
759 | 760 |
return true; |
760 |
|
|
761 | 761 |
}else{ |
762 | 762 |
return false; |
763 | 763 |
} |
... | ... | |
767 | 767 |
int treeRefFk, Taxon child, Taxon parent, Reference citation, String microCitation, Boolean provisional){ |
768 | 768 |
Classification tree = getClassificationTree(state, classificationMap, treeRefFk); |
769 | 769 |
TaxonNode result = tree.addParentChild(parent, child, citation, microCitation); |
770 |
result.setUnplaced(provisional); |
|
770 |
if (provisional){ |
|
771 |
result.setStatus(TaxonNodeStatus.DOUBTFUL); |
|
772 |
} |
|
771 | 773 |
return result; |
772 | 774 |
} |
773 | 775 |
|
app-import/src/main/java/eu/etaxonomy/cdm/io/cuba/CubaExcelImport.java | ||
---|---|---|
61 | 61 |
import eu.etaxonomy.cdm.model.taxon.SynonymType; |
62 | 62 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
63 | 63 |
import eu.etaxonomy.cdm.model.taxon.TaxonNode; |
64 |
import eu.etaxonomy.cdm.model.taxon.TaxonNodeStatus; |
|
64 | 65 |
import eu.etaxonomy.cdm.model.taxon.TaxonRelationship; |
65 | 66 |
import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType; |
66 | 67 |
import eu.etaxonomy.cdm.strategy.homotypicgroup.BasionymRelationCreator; |
... | ... | |
1009 | 1010 |
getTaxonNodeService().saveOrUpdate(newNode); |
1010 | 1011 |
if(isAbsent){ |
1011 | 1012 |
botanicalName.setTitleCache(taxonStrOrig, true); |
1012 |
newNode.setExcluded(true);
|
|
1013 |
newNode.setStatus(TaxonNodeStatus.EXCLUDED);
|
|
1013 | 1014 |
} |
1014 | 1015 |
|
1015 | 1016 |
return taxon; |
app-import/src/main/java/eu/etaxonomy/cdm/io/greece/FloraHellenicaCommentsImport.java | ||
---|---|---|
102 | 102 |
|
103 | 103 |
TaxonNode taxonNode = acceptedTaxon.getTaxonNodes().iterator().next(); |
104 | 104 |
if(taxonNode.isExcluded()){ |
105 |
taxonNode.putExcludedNote(Language.ENGLISH(), commentStr);
|
|
105 |
taxonNode.putStatusNote(Language.ENGLISH(), commentStr);
|
|
106 | 106 |
} |
107 | 107 |
return ; |
108 | 108 |
} |
app-import/src/main/java/eu/etaxonomy/cdm/io/greece/FloraHellenicaExcludedTaxonImport.java | ||
---|---|---|
31 | 31 |
import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode; |
32 | 32 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
33 | 33 |
import eu.etaxonomy.cdm.model.taxon.TaxonNode; |
34 |
import eu.etaxonomy.cdm.model.taxon.TaxonNodeStatus; |
|
34 | 35 |
import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImpl; |
35 | 36 |
|
36 | 37 |
/** |
... | ... | |
91 | 92 |
} |
92 | 93 |
} |
93 | 94 |
|
94 |
|
|
95 |
/** |
|
96 |
* @param state |
|
97 |
* @param line |
|
98 |
* @param record |
|
99 |
* @param noStr |
|
100 |
* @return |
|
101 |
*/ |
|
102 | 95 |
private TaxonNode makeTaxon(SimpleExcelTaxonImportState<CONFIG> state, String line, |
103 | 96 |
Map<String, String> record, |
104 | 97 |
String noStr) { |
... | ... | |
133 | 126 |
} |
134 | 127 |
taxon.addImportSource(noStr, getWorksheetName(state.getConfig()), getSourceCitation(state), null); |
135 | 128 |
TaxonNode excludedNode = familyTaxonNode.addChildTaxon(taxon, getSecReference(state), null); |
136 |
excludedNode.setExcluded(true);
|
|
129 |
excludedNode.setStatus(TaxonNodeStatus.EXCLUDED);
|
|
137 | 130 |
getTaxonNodeService().saveOrUpdate(excludedNode); |
138 | 131 |
return excludedNode; |
139 | 132 |
} |
140 | 133 |
|
141 |
|
|
142 |
|
|
143 |
/** |
|
144 |
* @return |
|
145 |
*/ |
|
146 | 134 |
private Reference makeHayek1929() { |
147 | 135 |
Reference ref = ReferenceFactory.newGeneric(); |
148 | 136 |
Person hayek = Person.NewInstance(); |
... | ... | |
152 | 140 |
return ref; |
153 | 141 |
} |
154 | 142 |
|
155 |
|
|
156 |
/** |
|
157 |
* @param record |
|
158 |
* @param state |
|
159 |
* @return |
|
160 |
*/ |
|
161 | 143 |
private TaxonNode getFamilyTaxon(Map<String, String> record, |
162 | 144 |
SimpleExcelTaxonImportState<CONFIG> state) { |
163 | 145 |
|
... | ... | |
188 | 170 |
return familyNode; |
189 | 171 |
} |
190 | 172 |
|
191 |
|
|
192 | 173 |
private ITaxonTreeNode getExcludedFamilyTaxon( |
193 | 174 |
SimpleExcelTaxonImportState<CONFIG> state) { |
194 | 175 |
|
... | ... | |
202 | 183 |
name.setTitleCache("Excluded", true); |
203 | 184 |
Taxon taxon = Taxon.NewInstance(name, getSecReference(state)); |
204 | 185 |
excludedFamilyNode = plantae.addChildTaxon(taxon, getSourceCitation(state), null); |
205 |
excludedFamilyNode.setExcluded(true);
|
|
186 |
excludedFamilyNode.setStatus(TaxonNodeStatus.EXCLUDED);
|
|
206 | 187 |
getTaxonNodeService().saveOrUpdate(excludedFamilyNode); |
207 | 188 |
return excludedFamilyNode; |
208 | 189 |
} |
Also available in: Unified diff
ref #9005 adapt imports to new TaxonNode.status and status notes