Revision 86536e03
Added by Andreas Müller almost 7 years ago
| app-import/src/main/java/eu/etaxonomy/cdm/io/ProtologueImport.java | ||
|---|---|---|
| 30 | 30 |
import eu.etaxonomy.cdm.model.media.Media; |
| 31 | 31 |
import eu.etaxonomy.cdm.model.media.MediaRepresentation; |
| 32 | 32 |
import eu.etaxonomy.cdm.model.media.MediaRepresentationPart; |
| 33 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
| 33 |
import eu.etaxonomy.cdm.model.name.TaxonName; |
|
| 34 | 34 |
|
| 35 | 35 |
|
| 36 | 36 |
/** |
| ... | ... | |
| 55 | 55 |
public void doInvoke(DefaultImportState<PalmaeProtologueImportConfigurator> state){
|
| 56 | 56 |
logger.info("start make Protologues from files ...");
|
| 57 | 57 |
|
| 58 |
Set<TaxonNameBase> nameStore = new HashSet<TaxonNameBase>();
|
|
| 58 |
Set<TaxonName> nameStore = new HashSet<>();
|
|
| 59 | 59 |
|
| 60 | 60 |
PalmaeProtologueImportConfigurator config = state.getConfig(); |
| 61 | 61 |
File source = config.getSource(); |
| 62 |
TaxonNameBase name;
|
|
| 62 |
TaxonName name; |
|
| 63 | 63 |
TransactionStatus txStatus = startTransaction(false); |
| 64 | 64 |
int count = 0; |
| 65 | 65 |
if (source.isDirectory()){
|
| ... | ... | |
| 82 | 82 |
return; |
| 83 | 83 |
} |
| 84 | 84 |
|
| 85 |
private void storeName(Set<TaxonNameBase> nameStore, TaxonNameBase name, DefaultImportState<PalmaeProtologueImportConfigurator> state){
|
|
| 85 |
private void storeName(Set<TaxonName> nameStore, TaxonName name, DefaultImportState<PalmaeProtologueImportConfigurator> state){
|
|
| 86 | 86 |
if (name != null){
|
| 87 | 87 |
nameStore.add(name); |
| 88 | 88 |
return; |
| ... | ... | |
| 92 | 92 |
} |
| 93 | 93 |
} |
| 94 | 94 |
|
| 95 |
private TaxonNameBase importFile(File file, DefaultImportState<PalmaeProtologueImportConfigurator> state){
|
|
| 95 |
private TaxonName importFile(File file, DefaultImportState<PalmaeProtologueImportConfigurator> state){
|
|
| 96 | 96 |
String originalSourceId = file.getName(); |
| 97 | 97 |
originalSourceId =originalSourceId.replace("_P.pdf", "");
|
| 98 | 98 |
originalSourceId =originalSourceId.replace("_tc_", "_tn_");
|
| ... | ... | |
| 100 | 100 |
|
| 101 | 101 |
|
| 102 | 102 |
//for testing only |
| 103 |
TaxonNameBase taxonName = getTaxonName(originalSourceId, namespace);
|
|
| 103 |
TaxonName taxonName = getTaxonName(originalSourceId, namespace); |
|
| 104 | 104 |
if (taxonName == null){
|
| 105 | 105 |
logger.warn("Name not found for " + originalSourceId);
|
| 106 | 106 |
return null; |
| ... | ... | |
| 130 | 130 |
|
| 131 | 131 |
} |
| 132 | 132 |
|
| 133 |
private TaxonNameDescription getNameDescription(TaxonNameBase taxonName) {
|
|
| 133 |
private TaxonNameDescription getNameDescription(TaxonName taxonName) {
|
|
| 134 | 134 |
TaxonNameDescription result; |
| 135 | 135 |
if (taxonName.getDescriptions().size()> 0){
|
| 136 | 136 |
result = (TaxonNameDescription)taxonName.getDescriptions().iterator().next(); |
| ... | ... | |
| 169 | 169 |
|
| 170 | 170 |
} |
| 171 | 171 |
|
| 172 |
private TaxonNameBase getTaxonName(String originalSourceId, String namespace){
|
|
| 173 |
TaxonNameBase result;
|
|
| 172 |
private TaxonName getTaxonName(String originalSourceId, String namespace){
|
|
| 173 |
TaxonName result; |
|
| 174 | 174 |
ICommonService commonService = getCommonService(); |
| 175 | 175 |
|
| 176 |
result = (TaxonNameBase)commonService.getSourcedObjectByIdInSource(TaxonNameBase.class, originalSourceId , namespace);
|
|
| 176 |
result = (TaxonName)commonService.getSourcedObjectByIdInSource(TaxonName.class, originalSourceId , namespace);
|
|
| 177 | 177 |
if (result == null){
|
| 178 | 178 |
logger.warn("Taxon (id: " + originalSourceId + ", namespace: " + namespace + ") could not be found");
|
| 179 | 179 |
} |
Also available in: Unified diff
fix #6368 rename table and class TaxonNameBase in app-import