Revision 285e489f
Added by Andreas Müller about 6 years ago
app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java | ||
---|---|---|
149 | 149 |
|
150 | 150 |
//type to count the references nomReferences that have been created and saved |
151 | 151 |
private class RefCounter{ |
152 |
RefCounter() {refCount = 0;};
|
|
152 |
RefCounter() {refCount = 0;} |
|
153 | 153 |
int refCount; |
154 | 154 |
|
155 | 155 |
@Override |
... | ... | |
183 | 183 |
referenceTable = referenceTable.isEmpty() ? " Reference" : referenceTable + " as Reference "; |
184 | 184 |
String strIdFrom = String.format(strFrom, referenceTable ); |
185 | 185 |
|
186 |
String strSelectIdBase = strSelectId + strIdFrom; |
|
187 |
|
|
188 | 186 |
String referenceFilter = CdmUtils.Nz(state.getConfig().getReferenceIdTable()); |
189 | 187 |
if (! referenceFilter.isEmpty()){ |
190 | 188 |
referenceFilter = " AND " + referenceFilter + " "; |
... | ... | |
441 | 439 |
}else if (categoryFk == REF_JOURNAL){ |
442 | 440 |
referenceBase = makeJournal(valueMap); |
443 | 441 |
}else if(categoryFk == REF_BOOK){ |
444 |
referenceBase = makeBook(valueMap, refToSave, relatedReferences);
|
|
442 |
referenceBase = makeBook(valueMap); |
|
445 | 443 |
}else if(categoryFk == REF_DATABASE){ |
446 | 444 |
referenceBase = makeDatabase(valueMap); |
447 | 445 |
}else if(categoryFk == REF_INFORMAL){ |
... | ... | |
455 | 453 |
}else if(categoryFk == REF_CONFERENCE_PROCEEDINGS){ |
456 | 454 |
referenceBase = makeProceedings(valueMap); |
457 | 455 |
}else if(categoryFk == REF_ARTICLE){ |
458 |
referenceBase = makeArticle(valueMap, refToSave, relatedReferences);
|
|
456 |
referenceBase = makeArticle(valueMap); |
|
459 | 457 |
}else if(categoryFk == REF_JOURNAL_VOLUME){ |
460 | 458 |
referenceBase = makeJournalVolume(valueMap); |
461 | 459 |
}else if(categoryFk == REF_PART_OF_OTHER_TITLE){ |
462 |
referenceBase = makePartOfOtherTitle(valueMap, refToSave, relatedReferences);
|
|
460 |
referenceBase = makePartOfOtherTitle(valueMap); |
|
463 | 461 |
}else{ |
464 | 462 |
logger.warn("Unknown categoryFk (" + categoryFk + "). Create 'Generic instead'"); |
465 | 463 |
referenceBase = ReferenceFactory.newGeneric(); |
... | ... | |
577 | 575 |
|
578 | 576 |
} |
579 | 577 |
|
580 |
private Reference makeArticle (Map<String, Object> valueMap, Map<Integer, Reference> refToSave, Map<String, Reference> relatedReferences){
|
|
578 |
private Reference makeArticle (Map<String, Object> valueMap){ |
|
581 | 579 |
|
582 | 580 |
IArticle article = ReferenceFactory.newArticle(); |
583 | 581 |
Object inRefFk = valueMap.get("inRefFk".toLowerCase()); |
... | ... | |
596 | 594 |
return (Reference)article; |
597 | 595 |
} |
598 | 596 |
|
599 |
private Reference makePartOfOtherTitle (Map<String, Object> valueMap, |
|
600 |
Map<Integer, Reference> refToSave, Map<String, Reference> relatedReferences){ |
|
597 |
private Reference makePartOfOtherTitle (Map<String, Object> valueMap){ |
|
601 | 598 |
|
602 | 599 |
Reference result; |
603 | 600 |
Object inRefFk = valueMap.get("inRefFk".toLowerCase()); |
... | ... | |
709 | 706 |
} |
710 | 707 |
|
711 | 708 |
private Reference makeBook( |
712 |
Map<String, Object> valueMap, |
|
713 |
Map<Integer, Reference> refToSave, |
|
714 |
Map<String, Reference> relatedReferences){ |
|
709 |
Map<String, Object> valueMap){ |
|
710 |
|
|
715 | 711 |
if (logger.isDebugEnabled()){logger.debug("RefType 'Book'");} |
716 | 712 |
Reference book = ReferenceFactory.newBook(); |
717 | 713 |
Integer refId = (Integer)valueMap.get("refId".toLowerCase()); |
Also available in: Unified diff
cleanup