Revision 7691ed2a
Added by Andreas Müller almost 5 years ago
app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraActivator.java | ||
---|---|---|
12 | 12 |
import java.lang.reflect.Method; |
13 | 13 |
import java.util.UUID; |
14 | 14 |
|
15 |
import org.apache.commons.lang3.StringUtils; |
|
15 | 16 |
import org.apache.log4j.Logger; |
16 | 17 |
|
17 | 18 |
import eu.etaxonomy.cdm.api.application.ICdmRepository; |
18 | 19 |
import eu.etaxonomy.cdm.app.berlinModelImport.BerlinModelSources; |
19 | 20 |
import eu.etaxonomy.cdm.app.berlinModelImport.TreeCreator; |
20 | 21 |
import eu.etaxonomy.cdm.app.common.CdmDestinations; |
21 |
import eu.etaxonomy.cdm.common.CdmUtils; |
|
22 | 22 |
import eu.etaxonomy.cdm.database.DbSchemaValidation; |
23 | 23 |
import eu.etaxonomy.cdm.database.ICdmDataSource; |
24 | 24 |
import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator; |
... | ... | |
32 | 32 |
import eu.etaxonomy.cdm.model.description.Feature; |
33 | 33 |
import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus; |
34 | 34 |
import eu.etaxonomy.cdm.model.name.NomenclaturalCode; |
35 |
import eu.etaxonomy.cdm.model.term.FeatureNode; |
|
36 | 35 |
import eu.etaxonomy.cdm.model.term.FeatureTree; |
37 | 36 |
|
38 | 37 |
|
... | ... | |
195 | 194 |
} |
196 | 195 |
//make feature tree |
197 | 196 |
app = bmImport.getCdmAppController(); |
198 |
FeatureTree tree = TreeCreator.flatTree(featureTreeUuid, bmImportConfigurator.getFeatureMap(), featureKeyList); |
|
197 |
FeatureTree<Feature> tree = TreeCreator.flatTree(featureTreeUuid, bmImportConfigurator.getFeatureMap(), featureKeyList);
|
|
199 | 198 |
// add image |
200 |
FeatureNode imageNode = FeatureNode.NewInstance(Feature.IMAGE()); |
|
201 |
tree.getRoot().addChild(imageNode); |
|
199 |
tree.getRoot().addChild(Feature.IMAGE()); |
|
202 | 200 |
// add distribution |
203 |
FeatureNode distributionNode = FeatureNode.NewInstance(Feature.DISTRIBUTION()); |
|
204 |
tree.getRoot().addChild(distributionNode); |
|
201 |
tree.getRoot().addChild(Feature.DISTRIBUTION()); |
|
205 | 202 |
app.getFeatureTreeService().saveOrUpdate(tree); |
206 | 203 |
} |
207 | 204 |
System.out.println("End import from BerlinModel ("+ source.getDatabase() + ")..."); |
... | ... | |
223 | 220 |
if (updateCollections){ |
224 | 221 |
success = updater.updateCollections(destination); |
225 | 222 |
} |
226 |
|
|
227 |
|
|
228 | 223 |
} |
229 | 224 |
|
230 | 225 |
|
231 |
|
|
232 |
|
|
233 |
|
|
234 | 226 |
private static NameTypeDesignationStatus nameTypeDesignationStatueMethod(String note){ |
235 |
if (CdmUtils.isEmpty(note)){
|
|
227 |
if (StringUtils.isBlank(note)){
|
|
236 | 228 |
return null; |
237 | 229 |
} |
238 | 230 |
note = note.trim(); |
... | ... | |
250 | 242 |
logger.warn("NameTypeDesignationStatus could not be defined for: " + note); |
251 | 243 |
return null; |
252 | 244 |
} |
253 |
|
|
254 |
|
|
255 | 245 |
} |
256 | 246 |
|
257 | 247 |
} |
Also available in: Unified diff
ref #8257 remove factory method for term node creation in app-import