Project

General

Profile

« Previous | Next » 

Revision 98a8ae95

Added by Katja Luther almost 3 years ago

use shortCitation with brackets for sec references

View differences:

cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightClassificationExport.java
1750 1750
                List<NameRelationship> otherRelationships = new ArrayList<>();
1751 1751

  
1752 1752
                for (NameRelationship rel: relatedList){
1753
                    // alle Homonyme und inverse blocking names
1754
                    if (rel.getType().equals(NameRelationshipType.LATER_HOMONYM()) || rel.getType().equals(NameRelationshipType.TREATED_AS_LATER_HOMONYM()) || (rel.getType().equals(NameRelationshipType.BLOCKING_NAME_FOR()))){
1755
                        nonNames.add(rel);
1756
                    }else if (!rel.getType().isBasionymRelation()){
1757
                        otherRelationships.add(rel);
1753
                    //no inverse relations
1754
                    if (rel.getFromName().equals(name)){
1755
                     // alle Homonyme und inverse blocking names
1756
                        if (rel.getType().equals(NameRelationshipType.LATER_HOMONYM())
1757
                                || rel.getType().equals(NameRelationshipType.TREATED_AS_LATER_HOMONYM())
1758
                                || (rel.getType().equals(NameRelationshipType.BLOCKING_NAME_FOR()))){
1759
                            nonNames.add(rel);
1760
                        }else if (!rel.getType().isBasionymRelation()){
1761
                            otherRelationships.add(rel);
1762
                        }
1758 1763
                    }
1759 1764
                }
1760 1765

  
......
1770 1775
                    if (relName.getFromName().equals(name)){
1771 1776
                        relatedName = relName.getToName();
1772 1777
                        nonRelNames += label + relatedName.getTitleCache() + " ";
1773
                    }else{
1774
                        label = relName.getType().getInverseLabel() + " ";
1775
                        relatedName = relName.getFromName();
1776
                        nonRelNames += label + relatedName.getTitleCache() + " ";
1777 1778
                    }
1779
//                    else{
1780
//                        label = relName.getType().getInverseLabel() + " ";
1781
//                        relatedName = relName.getFromName();
1782
//                        nonRelNames += label + relatedName.getTitleCache() + " ";
1783
//                    }
1778 1784

  
1779 1785

  
1780 1786
                }
......
1792 1798
                    if (rel.getFromName().equals(name)){
1793 1799
                        label = rel.getType().getLabel() + " ";
1794 1800
                        relatedName = rel.getToName();
1795
                    }else {
1796
                        label = rel.getType().getInverseLabel() + " ";
1797
                        relatedName = rel.getFromName();
1801
                        relNames += label + relatedName.getTitleCache() + " ";
1798 1802
                    }
1799
                    relNames += label + relatedName.getTitleCache() + " ";
1803
//                    else {
1804
//                        label = rel.getType().getInverseLabel() + " ";
1805
//                        relatedName = rel.getFromName();
1806
//                    }
1807

  
1800 1808
                }
1801 1809
                relNames.trim();
1802 1810
                if (otherRelationships.size() > 0){
......
2154 2162
            String[] csvLine = new String[table.getSize()];
2155 2163
            csvLine[table.getIndex(CdmLightExportTable.REFERENCE_ID)] = getId(state, reference);
2156 2164
            // TODO short citations correctly
2157
            String shortCitation = OriginalSourceFormatter.INSTANCE.format(reference, null); // Should be Author(year) like in Taxon.sec
2165
            String shortCitation = OriginalSourceFormatter.INSTANCE_WITH_YEAR_BRACKETS.format(reference, null); // Should be Author(year) like in Taxon.sec
2158 2166
            csvLine[table.getIndex(CdmLightExportTable.BIBLIO_SHORT_CITATION)] = shortCitation;
2159 2167
            // TODO get preferred title
2160 2168
            csvLine[table.getIndex(CdmLightExportTable.REF_TITLE)] = reference.isProtectedTitleCache()

Also available in: Unified diff