Revision 8422c0cd
Added by Andreas Müller almost 8 years ago
app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java | ||
---|---|---|
259 | 259 |
|
260 | 260 |
//for the concept reference a fixed uuid may be needed -> change uuid |
261 | 261 |
Integer sourceSecId = (Integer)config.getSourceSecId(); |
262 |
Reference<?> sec = refToSave.get(sourceSecId);
|
|
262 |
Reference sec = refToSave.get(sourceSecId); |
|
263 | 263 |
|
264 | 264 |
if (sec != null){ |
265 | 265 |
sec.setUuid(config.getSecUuid()); |
... | ... | |
309 | 309 |
|
310 | 310 |
if (inRefFk != null){ |
311 | 311 |
|
312 |
Reference<?> thisRef = relatedReferencesMap.get(String.valueOf(refId));
|
|
312 |
Reference thisRef = relatedReferencesMap.get(String.valueOf(refId)); |
|
313 | 313 |
|
314 |
Reference<?> inRef = relatedReferencesMap.get(String.valueOf(inRefFk));
|
|
314 |
Reference inRef = relatedReferencesMap.get(String.valueOf(inRefFk)); |
|
315 | 315 |
|
316 | 316 |
if (thisRef != null){ |
317 | 317 |
if (inRef == null){ |
... | ... | |
410 | 410 |
Boolean thesisFlag = (Boolean)valueMap.get("thesisFlag".toLowerCase()); |
411 | 411 |
|
412 | 412 |
|
413 |
Reference<?> referenceBase;
|
|
413 |
Reference referenceBase; |
|
414 | 414 |
logger.debug("RefCategoryFk: " + categoryFk); |
415 | 415 |
|
416 | 416 |
if (thesisFlag){ |
... | ... | |
489 | 489 |
BerlinModelImportState state, |
490 | 490 |
ResultSetPartitioner partitioner, |
491 | 491 |
int refId, |
492 |
Reference<?> ref,
|
|
492 |
Reference ref, |
|
493 | 493 |
RefCounter refCounter, |
494 | 494 |
Map<Integer, Reference> refToSave |
495 | 495 |
) throws SQLException{ |
... | ... | |
506 | 506 |
String strNomAuthorTeamFk = String.valueOf(nomAuthorTeamFk); |
507 | 507 |
TeamOrPersonBase<?> nomAuthor = teamMap.get(strNomAuthorTeamFk); |
508 | 508 |
|
509 |
Reference<?> sourceReference = state.getTransactionalSourceReference();
|
|
509 |
Reference sourceReference = state.getTransactionalSourceReference(); |
|
510 | 510 |
|
511 | 511 |
//preliminary |
512 | 512 |
if (isPreliminary){ |
... | ... | |
545 | 545 |
* @param referenceBase |
546 | 546 |
* @param nomReference |
547 | 547 |
*/ |
548 |
private void copyCreatedUpdated(Reference<?> biblioReference, Reference nomReference) {
|
|
548 |
private void copyCreatedUpdated(Reference biblioReference, Reference nomReference) { |
|
549 | 549 |
biblioReference.setCreatedBy(nomReference.getCreatedBy()); |
550 | 550 |
biblioReference.setCreated(nomReference.getCreated()); |
551 | 551 |
biblioReference.setUpdatedBy(nomReference.getUpdatedBy()); |
... | ... | |
553 | 553 |
|
554 | 554 |
} |
555 | 555 |
|
556 |
private Reference<?> makeArticle (Map<String, Object> valueMap, Map<Integer, Reference> refToSave, Map<String, Reference> relatedReferences){
|
|
556 |
private Reference makeArticle (Map<String, Object> valueMap, Map<Integer, Reference> refToSave, Map<String, Reference> relatedReferences){ |
|
557 | 557 |
|
558 | 558 |
IArticle article = ReferenceFactory.newArticle(); |
559 | 559 |
Object inRefFk = valueMap.get("inRefFk".toLowerCase()); |
... | ... | |
569 | 569 |
logger.warn ("Article has no inreference: " + refId); |
570 | 570 |
} |
571 | 571 |
makeStandardMapper(valueMap, (Reference)article); //url, pages, series, volume |
572 |
return (Reference<?>)article;
|
|
572 |
return (Reference)article; |
|
573 | 573 |
} |
574 | 574 |
|
575 |
private Reference<?> makePartOfOtherTitle (Map<String, Object> valueMap,
|
|
575 |
private Reference makePartOfOtherTitle (Map<String, Object> valueMap, |
|
576 | 576 |
Map<Integer, Reference> refToSave, Map<String, Reference> relatedReferences){ |
577 | 577 |
|
578 |
Reference<?> result;
|
|
578 |
Reference result; |
|
579 | 579 |
Object inRefFk = valueMap.get("inRefFk".toLowerCase()); |
580 | 580 |
Integer inRefCategoryFk = (Integer)valueMap.get("inRefCategoryFk".toLowerCase()); |
581 | 581 |
Integer refId = (Integer)valueMap.get("refId".toLowerCase()); |
... | ... | |
591 | 591 |
}else if (inRefCategoryFk == REF_BOOK){ |
592 | 592 |
//BookSection |
593 | 593 |
IBookSection bookSection = ReferenceFactory.newBookSection(); |
594 |
result = (Reference<?>)bookSection;
|
|
594 |
result = (Reference)bookSection; |
|
595 | 595 |
}else if (inRefCategoryFk == REF_ARTICLE){ |
596 | 596 |
//Article |
597 | 597 |
logger.info("Reference (refId = " + refId + ") of type 'part_of_other_title' is part of 'article'." + |
... | ... | |
635 | 635 |
return result; |
636 | 636 |
} |
637 | 637 |
|
638 |
private Reference<?> makeWebSite(Map<String, Object> valueMap){
|
|
638 |
private Reference makeWebSite(Map<String, Object> valueMap){ |
|
639 | 639 |
if (logger.isDebugEnabled()){logger.debug("RefType 'Website'");} |
640 |
Reference<?> webPage = ReferenceFactory.newWebPage();
|
|
640 |
Reference webPage = ReferenceFactory.newWebPage(); |
|
641 | 641 |
makeStandardMapper(valueMap, webPage); //placePublished, publisher |
642 | 642 |
return webPage; |
643 | 643 |
} |
644 | 644 |
|
645 |
private Reference<?> makeUnknown(Map<String, Object> valueMap){
|
|
645 |
private Reference makeUnknown(Map<String, Object> valueMap){ |
|
646 | 646 |
if (logger.isDebugEnabled()){logger.debug("RefType 'Unknown'");} |
647 |
Reference<?> generic = ReferenceFactory.newGeneric();
|
|
647 |
Reference generic = ReferenceFactory.newGeneric(); |
|
648 | 648 |
// generic.setSeries(series); |
649 | 649 |
makeStandardMapper(valueMap, generic); //pages, placePublished, publisher, series, volume |
650 | 650 |
return generic; |
651 | 651 |
} |
652 | 652 |
|
653 |
private Reference<?> makeInformal(Map<String, Object> valueMap){
|
|
653 |
private Reference makeInformal(Map<String, Object> valueMap){ |
|
654 | 654 |
if (logger.isDebugEnabled()){logger.debug("RefType 'Informal'");} |
655 |
Reference<?> generic = ReferenceFactory.newGeneric();
|
|
655 |
Reference generic = ReferenceFactory.newGeneric(); |
|
656 | 656 |
// informal.setSeries(series); |
657 | 657 |
makeStandardMapper(valueMap, generic);//editor, pages, placePublished, publisher, series, volume |
658 | 658 |
String informal = (String)valueMap.get("InformalRefCategory".toLowerCase()); |
... | ... | |
662 | 662 |
return generic; |
663 | 663 |
} |
664 | 664 |
|
665 |
private Reference<?> makeDatabase(Map<String, Object> valueMap){
|
|
665 |
private Reference makeDatabase(Map<String, Object> valueMap){ |
|
666 | 666 |
if (logger.isDebugEnabled()){logger.debug("RefType 'Database'");} |
667 |
Reference<?> database = ReferenceFactory.newDatabase();
|
|
667 |
Reference database = ReferenceFactory.newDatabase(); |
|
668 | 668 |
makeStandardMapper(valueMap, database); //? |
669 | 669 |
return database; |
670 | 670 |
} |
671 | 671 |
|
672 |
private Reference<?> makeJournal(Map<String, Object> valueMap){
|
|
672 |
private Reference makeJournal(Map<String, Object> valueMap){ |
|
673 | 673 |
if (logger.isDebugEnabled()){logger.debug("RefType 'Journal'");} |
674 |
Reference<?> journal = ReferenceFactory.newJournal();
|
|
674 |
Reference journal = ReferenceFactory.newJournal(); |
|
675 | 675 |
|
676 | 676 |
Set<String> omitAttributes = new HashSet<String>(); |
677 | 677 |
String series = "series"; |
... | ... | |
684 | 684 |
return journal; |
685 | 685 |
} |
686 | 686 |
|
687 |
private Reference<?> makeBook(
|
|
687 |
private Reference makeBook( |
|
688 | 688 |
Map<String, Object> valueMap, |
689 | 689 |
Map<Integer, Reference> refToSave, |
690 | 690 |
Map<String, Reference> relatedReferences){ |
691 | 691 |
if (logger.isDebugEnabled()){logger.debug("RefType 'Book'");} |
692 |
Reference<?> book = ReferenceFactory.newBook();
|
|
692 |
Reference book = ReferenceFactory.newBook(); |
|
693 | 693 |
Integer refId = (Integer)valueMap.get("refId".toLowerCase()); |
694 | 694 |
|
695 | 695 |
//Set bookAttributes = new String[]{"edition", "isbn", "pages","publicationTown","publisher","volume"}; |
... | ... | |
729 | 729 |
* @param relatedNomReferences |
730 | 730 |
* @return |
731 | 731 |
*/ |
732 |
private Reference<?> getReferenceFromMaps(
|
|
732 |
private Reference getReferenceFromMaps( |
|
733 | 733 |
int inRefFkInt, |
734 | 734 |
Map<Integer, Reference> refToSaveMap, |
735 | 735 |
Map<String, Reference> relatedRefMap) { |
736 |
Reference<?> result = null;
|
|
736 |
Reference result = null; |
|
737 | 737 |
result = refToSaveMap.get(inRefFkInt); |
738 | 738 |
if (result == null){ |
739 | 739 |
result = relatedRefMap.get(String.valueOf(inRefFkInt)); |
... | ... | |
741 | 741 |
return result; |
742 | 742 |
} |
743 | 743 |
|
744 |
private Reference<?> makePrintSeries(Map<String, Object> valueMap){
|
|
744 |
private Reference makePrintSeries(Map<String, Object> valueMap){ |
|
745 | 745 |
if (logger.isDebugEnabled()){logger.debug("RefType 'PrintSeries'");} |
746 |
Reference<?> printSeries = ReferenceFactory.newPrintSeries();
|
|
746 |
Reference printSeries = ReferenceFactory.newPrintSeries(); |
|
747 | 747 |
makeStandardMapper(valueMap, printSeries, null); |
748 | 748 |
return printSeries; |
749 | 749 |
} |
750 | 750 |
|
751 |
private Reference<?> makeProceedings(Map<String, Object> valueMap){
|
|
751 |
private Reference makeProceedings(Map<String, Object> valueMap){ |
|
752 | 752 |
if (logger.isDebugEnabled()){logger.debug("RefType 'Proceedings'");} |
753 |
Reference<?> proceedings = ReferenceFactory.newProceedings();
|
|
753 |
Reference proceedings = ReferenceFactory.newProceedings(); |
|
754 | 754 |
makeStandardMapper(valueMap, proceedings, null); |
755 | 755 |
return proceedings; |
756 | 756 |
} |
757 | 757 |
|
758 |
private Reference<?> makeThesis(Map<String, Object> valueMap){
|
|
758 |
private Reference makeThesis(Map<String, Object> valueMap){ |
|
759 | 759 |
if (logger.isDebugEnabled()){logger.debug("RefType 'Thesis'");} |
760 |
Reference<?> thesis = ReferenceFactory.newThesis();
|
|
760 |
Reference thesis = ReferenceFactory.newThesis(); |
|
761 | 761 |
makeStandardMapper(valueMap, thesis, null); |
762 | 762 |
return thesis; |
763 | 763 |
} |
764 | 764 |
|
765 | 765 |
|
766 |
private Reference<?> makeJournalVolume(Map<String, Object> valueMap){
|
|
766 |
private Reference makeJournalVolume(Map<String, Object> valueMap){ |
|
767 | 767 |
if (logger.isDebugEnabled()){logger.debug("RefType 'JournalVolume'");} |
768 | 768 |
//Proceedings proceedings = Proceedings.NewInstance(); |
769 |
Reference<?> journalVolume = ReferenceFactory.newGeneric();
|
|
769 |
Reference journalVolume = ReferenceFactory.newGeneric(); |
|
770 | 770 |
makeStandardMapper(valueMap, journalVolume, null); |
771 | 771 |
logger.warn("Journal volumes not yet implemented. Generic created instead but with errors"); |
772 | 772 |
return journalVolume; |
773 | 773 |
} |
774 | 774 |
|
775 |
private boolean makeStandardMapper(Map<String, Object> valueMap, Reference<?> ref){
|
|
775 |
private boolean makeStandardMapper(Map<String, Object> valueMap, Reference ref){ |
|
776 | 776 |
return makeStandardMapper(valueMap, ref, null); |
777 | 777 |
} |
778 | 778 |
|
Also available in: Unified diff
Remove generics from Reference in cdmlib-app #5830