Project

General

Profile

« Previous | Next » 

Revision b2956a5e

Added by Andreas Müller over 4 years ago

ref #8509 add Subterclass, Parvorder and Infrakingdom, adapt number for (sub)section, make (sub)division and (sub)phylum equal and some other improvements for rank handling

View differences:

cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTransformer.java
237 237
	public static int Animalia_Class = 60;
238 238
	public static int Animalia_Subclass = 70;
239 239
	public static int Animalia_Infraclass = 80;
240
	public static int Animalia_Subterclass = 85;
241

  
240 242
	public static int Animalia_Superorder = 90;
241 243
	public static int Animalia_Order = 100;
242 244
	public static int Animalia_Suborder = 110;
243 245
	public static int Animalia_Infraorder = 120;
244
	public static int Animalia_Section = 121;
245
	public static int Animalia_Subsection = 122;
246
	public static int Animalia_Parvorder = 122;
247
    public static int Animalia_Section = 125;
248
	public static int Animalia_Subsection = 127;
246 249
	public static int Animalia_Superfamily = 130;
247 250
	public static int Animalia_Family = 140;
248 251
	public static int Animalia_Subfamily = 150;
......
260 263
	// Plantae Ranks
261 264
	public static int Plantae_Kingdom = 10;
262 265
	public static int Plantae_Subkingdom = 20;
263
	public static int Plantae_Phylum = 20;
264
	public static int Plantae_Subphylum = 20;
266
	public static int Plantae_Infrakingdom = 25;
267
	public static int Plantae_Phylum = 30;  //Phylum and Division is same (#8541)
265 268
	public static int Plantae_Division = 30;
266
	public static int Plantae_Subdivision = 40;
269
	public static int Plantae_Subphylum = 40;
270
    public static int Plantae_Subdivision = 40;
267 271
	public static int Plantae_Class = 60;
268 272
	public static int Plantae_Subclass = 70;
269 273
	public static int Plantae_Superorder = 90;
......
1622 1626
	 * @return
1623 1627
	 */
1624 1628
	public String getCacheByRankAndKingdom(Rank rank, Integer pesiKingdomId) {
1625
		if (rank == null){
1629
		if (rank == null || pesiKingdomId == null){
1626 1630
			return null;
1627 1631
		}else{
1628
			return this.rankCacheMap.get(pesiKingdomId).get(rank2RankId(rank, pesiKingdomId));
1632
		    Map<Integer, String> rankMap = this.rankCacheMap.get(pesiKingdomId);
1633
		    if (rankMap != null){
1634
		        return rankMap.get(rank2RankId(rank, pesiKingdomId));
1635
		    }else{
1636
		        logger.warn("RankCacheMap is null for " + pesiKingdomId);
1637
		        return null;
1638
		    }
1629 1639
		}
1630 1640
	}
1631 1641

  
......
1681 1691
		if (pesiKingdomId != null && pesiKingdomId.intValue() == KINGDOM_ANIMALIA) {
1682 1692
			if (rank.equals(Rank.KINGDOM())) {
1683 1693
				result = Animalia_Kingdom;
1684
			} else if (rank.equals(Rank.SUBKINGDOM())) {
1694
            } else if (rank.equals(Rank.SUBKINGDOM())) {
1685 1695
				result = Animalia_Subkingdom;
1686 1696
			} else if (rank.equals(Rank.SUPERPHYLUM())) {
1687 1697
				result = Animalia_Superphylum;
......
1697 1707
				result = Animalia_Class;
1698 1708
			} else if (rank.equals(Rank.SUBCLASS())) {
1699 1709
				result = Animalia_Subclass;
1700
			} else if (rank.equals(Rank.INFRACLASS())) {
1710
            } else if (rank.equals(Rank.INFRACLASS())) {
1701 1711
				result = Animalia_Infraclass;
1712
            } else if (rank.getUuid().equals(ErmsTransformer.uuidRankSubterclass)) {
1713
                result = Animalia_Subterclass;
1702 1714
			} else if (rank.equals(Rank.SUPERORDER())) {
1703 1715
				result = Animalia_Superorder;
1704 1716
			} else if (rank.equals(Rank.ORDER())) {
......
1707 1719
				result = Animalia_Suborder;
1708 1720
			} else if (rank.equals(Rank.INFRAORDER())) {
1709 1721
				result = Animalia_Infraorder;
1710
			} else if (rank.equals(Rank.SECTION_ZOOLOGY())) {
1722
			} else if (rank.getUuid().equals(ErmsTransformer.uuidRankParvorder)) {
1723
                result = Animalia_Parvorder;
1724
            } else if (rank.equals(Rank.SECTION_ZOOLOGY())) {
1711 1725
				result = Animalia_Section;
1712 1726
			} else if (rank.equals(Rank.SUBSECTION_ZOOLOGY())) {
1713 1727
				result = Animalia_Subsection;
......
1745 1759
		} else if (pesiKingdomId != null && pesiKingdomId.intValue() == KINGDOM_PLANTAE) {
1746 1760
			if (rank.equals(Rank.KINGDOM())) {
1747 1761
				result = Plantae_Kingdom;
1748
			} else if (rank.equals(Rank.SUBKINGDOM())) {
1762
			} else if (rank.equals(Rank.INFRAKINGDOM())) {
1763
                result = Plantae_Infrakingdom;
1764
            } else if (rank.equals(Rank.SUBKINGDOM())) {
1749 1765
				result = Plantae_Subkingdom;
1750
			}else if (rank.equals(Rank.PHYLUM())) {
1751
				result = Plantae_Phylum;
1752
			}else if (rank.equals(Rank.SUBPHYLUM())) {
1753
				result = Plantae_Subphylum;
1754
			}else if (rank.equals(Rank.DIVISION())) {
1766
            }else if (rank.equals(Rank.PHYLUM())) {   //is same as Division  (#8541)
1767
                result = Plantae_Phylum;
1768
            }else if (rank.equals(Rank.DIVISION())) {
1755 1769
				result = Plantae_Division;
1770
            } else if (rank.equals(Rank.SUBPHYLUM())) {
1771
                result = Plantae_Subphylum;
1756 1772
			} else if (rank.equals(Rank.SUBDIVISION())) {
1757 1773
				result = Plantae_Subdivision;
1758 1774
			} else if (rank.equals(Rank.CLASS())) {

Also available in: Unified diff