Revision 4e9ab74e
Added by Katja Luther over 14 years ago
| cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/DataSet.java | ||
|---|---|---|
| 43 | 43 |
import eu.etaxonomy.cdm.model.common.User; |
| 44 | 44 |
import eu.etaxonomy.cdm.model.description.AbsenceTerm; |
| 45 | 45 |
import eu.etaxonomy.cdm.model.description.Feature; |
| 46 |
import eu.etaxonomy.cdm.model.description.FeatureNode; |
|
| 46 | 47 |
import eu.etaxonomy.cdm.model.description.FeatureTree; |
| 47 | 48 |
import eu.etaxonomy.cdm.model.description.MeasurementUnit; |
| 48 | 49 |
import eu.etaxonomy.cdm.model.description.MediaKey; |
| ... | ... | |
| 132 | 133 |
"eventBases", |
| 133 | 134 |
"references", |
| 134 | 135 |
"typeDesignations", |
| 136 |
"featureNodes", |
|
| 135 | 137 |
"featureTrees", |
| 136 | 138 |
"taxonNodes", |
| 137 | 139 |
"taxonomicTrees", |
| ... | ... | |
| 216 | 218 |
@XmlElement(name = "FeatureTree", namespace = "http://etaxonomy.eu/cdm/model/description/1.0") |
| 217 | 219 |
protected List<FeatureTree> featureTrees = new ArrayList<FeatureTree>(); |
| 218 | 220 |
|
| 221 |
@XmlElementWrapper(name = "FeatureNodes") |
|
| 222 |
@XmlElement(name = "FeatureNodes", namespace = "http://etaxonomy.eu/cdm/model/description/1.0") |
|
| 223 |
protected List<FeatureNode> featureNodes = new ArrayList<FeatureNode>(); |
|
| 224 |
|
|
| 219 | 225 |
@XmlElementWrapper(name = "TaxonomicTrees") |
| 220 | 226 |
@XmlElement(name = "TaxonomicTree", namespace = "http://etaxonomy.eu/cdm/model/taxon/1.0") |
| 221 | 227 |
protected List<TaxonomicTree> taxonomicTrees = new ArrayList<TaxonomicTree>(); |
| ... | ... | |
| 817 | 823 |
this.users.add(deproxy); |
| 818 | 824 |
|
| 819 | 825 |
} |
| 826 |
|
|
| 827 |
public void setFeatureNodes(List<FeatureNode> featureNodesdeproxy) {
|
|
| 828 |
this.featureNodes = featureNodesdeproxy; |
|
| 829 |
|
|
| 830 |
} |
|
| 831 |
|
|
| 832 |
public List<FeatureNode> getFeatureNodes() {
|
|
| 833 |
|
|
| 834 |
return featureNodes; |
|
| 835 |
} |
|
| 820 | 836 |
|
| 821 | 837 |
} |
| cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbExport.java | ||
|---|---|---|
| 27 | 27 |
import eu.etaxonomy.cdm.model.agent.AgentBase; |
| 28 | 28 |
import eu.etaxonomy.cdm.model.common.DefinedTermBase; |
| 29 | 29 |
import eu.etaxonomy.cdm.model.common.User; |
| 30 |
import eu.etaxonomy.cdm.model.description.FeatureNode; |
|
| 30 | 31 |
import eu.etaxonomy.cdm.model.description.FeatureTree; |
| 31 | 32 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
| 32 | 33 |
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; |
| ... | ... | |
| 268 | 269 |
HibernateProxyHelper.deproxy(featureTree); |
| 269 | 270 |
taxTreesdeproxy.add(featureTree); |
| 270 | 271 |
} |
| 272 |
|
|
| 273 |
List<FeatureNode> featureNodes = new ArrayList<FeatureNode>(); |
|
| 274 |
featureNodes= getFeatureTreeService().getFeatureNodesAll(); |
|
| 275 |
List<FeatureNode> taxNodesdeproxy = new ArrayList<FeatureNode>(); |
|
| 276 |
for (FeatureNode featureNode : featureNodes){
|
|
| 277 |
HibernateProxyHelper.deproxy(featureNode); |
|
| 278 |
taxNodesdeproxy.add(featureNode); |
|
| 279 |
} |
|
| 280 |
|
|
| 281 |
dataSet.setFeatureNodes(taxNodesdeproxy); |
|
| 282 |
|
|
| 271 | 283 |
dataSet.setFeatureTrees(getFeatureTreeService().list(null,null,null,null,null)); |
| 272 | 284 |
} |
| 273 | 285 |
if (jaxbExpConfig.isDoTaxonomicTreeData() == true) {
|
| cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbImport.java | ||
|---|---|---|
| 31 | 31 |
import eu.etaxonomy.cdm.model.common.TermVocabulary; |
| 32 | 32 |
import eu.etaxonomy.cdm.model.common.User; |
| 33 | 33 |
import eu.etaxonomy.cdm.model.description.DescriptionBase; |
| 34 |
import eu.etaxonomy.cdm.model.description.FeatureNode; |
|
| 34 | 35 |
import eu.etaxonomy.cdm.model.description.FeatureTree; |
| 35 | 36 |
import eu.etaxonomy.cdm.model.media.Media; |
| 36 | 37 |
import eu.etaxonomy.cdm.model.name.HomotypicalGroup; |
| ... | ... | |
| 120 | 121 |
List<TypeDesignationBase> typeDesignations; |
| 121 | 122 |
List<SpecimenOrObservationBase> occurrences; |
| 122 | 123 |
List<FeatureTree> featureTrees; |
| 124 |
List<FeatureNode> featureNodes; |
|
| 123 | 125 |
List<Media> media; |
| 124 | 126 |
List<LanguageStringBase> languageData; |
| 125 | 127 |
List<TermVocabulary<DefinedTermBase>> termVocabularies; |
| ... | ... | |
| 308 | 310 |
//txStatus = startTransaction(); |
| 309 | 311 |
try {
|
| 310 | 312 |
if (jaxbImpConfig.isDoFeatureData() == true) {
|
| 313 |
if ((featureNodes = dataSet.getFeatureNodes()).size() >0){
|
|
| 314 |
logger.error("Feature data: " + featureNodes.size());
|
|
| 315 |
getFeatureTreeService().saveFeatureNodesAll(featureNodes); |
|
| 316 |
} |
|
| 311 | 317 |
if ((featureTrees = dataSet.getFeatureTrees()).size() > 0) {
|
| 312 | 318 |
logger.error("Feature data: " + featureTrees.size());
|
| 313 | 319 |
getFeatureTreeService().save(featureTrees); |
| cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/WarningTolerantValidationEventHandler.java | ||
|---|---|---|
| 30 | 30 |
return true; |
| 31 | 31 |
} else {
|
| 32 | 32 |
ValidationEventLocator validationEventLocator = validationEvent.getLocator(); |
| 33 |
// System.err.println("Stacktrace: "+validationEvent.getLinkedException().getMessage());
|
|
| 33 |
|
|
| 34 | 34 |
logger.warn("Line:Col[" + validationEventLocator.getLineNumber() + ":" + validationEventLocator.getColumnNumber() +"]:" + validationEvent.getMessage()+ " : "+validationEvent.getLinkedException().getStackTrace());
|
| 35 | 35 |
|
| 36 | 36 |
return false; |
Also available in: Unified diff