Revision 892efc69
Added by Andreas Kohlbecker almost 14 years ago
| cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java | ||
|---|---|---|
| 16 | 16 |
import org.apache.log4j.Logger; |
| 17 | 17 |
|
| 18 | 18 |
import eu.etaxonomy.cdm.common.CdmUtils; |
| 19 |
import eu.etaxonomy.cdm.model.common.AnnotationType; |
|
| 19 | 20 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| 20 | 21 |
import eu.etaxonomy.cdm.model.common.DescriptionElementSource; |
| 21 | 22 |
import eu.etaxonomy.cdm.model.common.ExtensionType; |
| ... | ... | |
| 96 | 97 |
if (extensionType == null){
|
| 97 | 98 |
extensionType = ExtensionType.NewInstance(text, label, labelAbbrev); |
| 98 | 99 |
extensionType.setUuid(uuid); |
| 100 |
extensionType.setVocabulary(ExtensionType.DOI().getVocabulary()); |
|
| 99 | 101 |
getTermService().save(extensionType); |
| 100 |
state.putExtensionType(extensionType); |
|
| 101 | 102 |
} |
| 103 |
state.putExtensionType(extensionType); |
|
| 102 | 104 |
} |
| 103 | 105 |
return extensionType; |
| 104 | 106 |
} |
| ... | ... | |
| 110 | 112 |
if (markerType == null){
|
| 111 | 113 |
markerType = MarkerType.NewInstance(label, text, labelAbbrev); |
| 112 | 114 |
markerType.setUuid(uuid); |
| 115 |
markerType.setVocabulary(MarkerType.COMPLETE().getVocabulary()); |
|
| 113 | 116 |
getTermService().save(markerType); |
| 114 |
state.putMarkerType(markerType); |
|
| 115 | 117 |
} |
| 118 |
state.putMarkerType(markerType); |
|
| 116 | 119 |
} |
| 117 | 120 |
return markerType; |
| 118 | 121 |
} |
| 119 | 122 |
|
| 123 |
protected AnnotationType getAnnotationType(STATE state, UUID uuid, String label, String text, String labelAbbrev){
|
|
| 124 |
AnnotationType annotationType = state.getAnnotationType(uuid); |
|
| 125 |
if (annotationType == null){
|
|
| 126 |
annotationType = (AnnotationType)getTermService().find(uuid); |
|
| 127 |
if (annotationType == null){
|
|
| 128 |
annotationType = AnnotationType.NewInstance(label, text, labelAbbrev); |
|
| 129 |
annotationType.setUuid(uuid); |
|
| 130 |
annotationType.setVocabulary(AnnotationType.EDITORIAL().getVocabulary()); |
|
| 131 |
getTermService().save(annotationType); |
|
| 132 |
} |
|
| 133 |
state.putAnnotationType(annotationType); |
|
| 134 |
} |
|
| 135 |
return annotationType; |
|
| 136 |
} |
|
| 137 |
|
|
| 120 | 138 |
/** |
| 121 | 139 |
* Returns a named area for a given uuid by first . If the named area does not |
| 122 | 140 |
* @param state |
| ... | ... | |
| 133 | 151 |
if (namedArea == null){
|
| 134 | 152 |
namedArea = (NamedArea)getTermService().find(uuid); |
| 135 | 153 |
if (namedArea == null){
|
| 136 |
namedArea = NamedArea.NewInstance(label, text, labelAbbrev);
|
|
| 154 |
namedArea = NamedArea.NewInstance(text, label, labelAbbrev);
|
|
| 137 | 155 |
namedArea.setType(areaType); |
| 138 | 156 |
namedArea.setLevel(level); |
| 139 | 157 |
namedArea.setUuid(uuid); |
| 140 | 158 |
getTermService().save(namedArea); |
| 141 |
state.putNamedArea(namedArea); |
|
| 142 | 159 |
} |
| 160 |
state.putNamedArea(namedArea); |
|
| 143 | 161 |
} |
| 144 | 162 |
return namedArea; |
| 145 | 163 |
} |
Also available in: Unified diff
merging /branches/cdmlib/SPRINT-Chichorieae1/ to trunk