Project

General

Profile

Revision cfb05c06

IDcfb05c06568367c019d0b848a98cbf4f71712377
Parent 45cac117
Child 5618ca88

Added by Andreas Kohlbecker almost 3 years ago

ref #7918 harmonizing ReferencePropertyDefinitions with latest changes in reference interface hierarchy

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/ReferencePropertyDefinitions.java
26 26
 */
27 27
public class ReferencePropertyDefinitions {
28 28

  
29
    private static Map<String, String> iReference = new HashMap<>();
29 30
    private static Map<String, String> iPublicationBase = new HashMap<>();
30 31
    private static Map<String, String> iWithAuthorAndDate = new HashMap<>();
31
    private static Map<String, String> iReference = new HashMap<>();
32
    private static Map<String, String> iWithDoi = new HashMap<>();
33
    private static Map<String, String> iAuthoredPublicationBase = new HashMap<>();
34
    private static Map<String, String> iNomenclaturalReference = new HashMap<>();
32 35
    private static Map<String, String> iVolumeReference = new HashMap<>();
33 36
    private static Map<String, String> iSection = new HashMap<>();
34 37
    private static Map<String, String> iPrintedUnitBase = new HashMap<>();
......
51 54
        put(iWithAuthorAndDate, "authorship");
52 55
        put(iWithAuthorAndDate, "datePublished");
53 56

  
57
        put(iWithDoi, "doi");
58

  
54 59
        iPublicationBase = merge(iReference);
55 60
        put(iPublicationBase, "publisher");
56 61
        put(iPublicationBase, "placePublished");
57
        put(iPublicationBase, "doi");
58 62

  
59
        iSection = merge(iReference);
63
        // put(iNomenclaturalReference, "year");
64
        // put(iNomenclaturalReference, "nomenclaturalCitation");
65

  
66
        iAuthoredPublicationBase = merge(iPublicationBase , iWithAuthorAndDate, iWithDoi);
67

  
68
        iSection = merge(iReference, iWithAuthorAndDate, iWithDoi, iNomenclaturalReference);
60 69
        put(iSection, "pages");
61 70
        put(iSection, "inReference");
62 71

  
63
        iVolumeReference = merge(iReference, iWithAuthorAndDate);
72
        iVolumeReference = merge(iReference, iWithAuthorAndDate, iWithDoi);
64 73
        put(iVolumeReference, "volume");
65 74

  
66 75
        iPrintedUnitBase = merge(iPublicationBase, iSection, iVolumeReference);
......
68 77
        put(iPrintedUnitBase, "abbrevTitle");
69 78
        put(iPrintedUnitBase, "inReference", "inSeries");
70 79
        put(iPrintedUnitBase, "editor");
71
        put(iPrintedUnitBase, "doi");
72 80

  
73 81
        iArticle = merge(iSection, iVolumeReference);
74 82
        put(iArticle, "inReference", "inJournal");
75
        put(iArticle, "doi");
76 83

  
77 84
        iBook = merge(iPrintedUnitBase);
78
        put(iArticle, "inReference", "inSeries");
79
        put(iArticle, "edition");
80
        put(iArticle, "isbn");
85
        put(iBook, "inReference", "inSeries");
86
        put(iBook, "edition");
87
        put(iBook, "isbn");
81 88

  
82 89
        iBookSection = merge(iSection);
83 90
        put(iBookSection, "inReference", "inBook");
84
        put(iBookSection, "doi");
85 91

  
86 92
        iProceedings = merge(iPrintedUnitBase);
87 93
        put(iProceedings, "organization");
88
        put(iProceedings, "doi");
89 94
        put(iProceedings, "isbn");
90 95

  
91 96
        iJournal = merge(iPublicationBase);
......
94 99
        iInProceedings = merge(iSection);
95 100
        remove(iInProceedings, "series");
96 101
        put(iInProceedings, "inReference", "In proceedings");
97
        put(iInProceedings, "doi");
98 102

  
99 103
        iPrintSeries = merge(iPublicationBase);
100
        remove(iPrintSeries, "doi");
101 104
        put(iPrintSeries, "publisher");
102 105
        put(iPrintSeries, "placePublished");
103 106

  

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)