Project

General

Profile

« Previous | Next » 

Revision 925afb79

Added by Andreas Müller over 4 years ago

cleanup

View differences:

cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/indexFungorum/IndexFungorumSubSpeciesImport.java
66 66
        for (UUID infraspecificTaxonUUID: state.getInfraspecificTaxaUUIDs()){
67 67
        	TransactionStatus txStatus = startTransaction();
68 68
        	Taxon infraspecificTaxon = (Taxon)getTaxonService().load(infraspecificTaxonUUID, propertyPaths);
69
            //HibernateProxyHelper.deproxy(infraspecificTaxon);
69

  
70 70
            TaxonName name = infraspecificTaxon.getName();
71 71

  
72
            getNameService().saveOrUpdate(name);
72
//            getNameService().saveOrUpdate(name);
73 73
            String parentNameString = getParentNameInfraSpecific(name);
74
            System.out.println("Parent name string: " + parentNameString);
74
//            System.out.println("Parent name string: " + parentNameString);
75 75
            MatchingTaxonConfigurator matchingConfig = new MatchingTaxonConfigurator();
76 76
            matchingConfig.setTaxonNameTitle(parentNameString);
77 77

  
......
81 81
                    //Taxon.class, parentNameString + "sec. ", MatchMode.BEGINNING, , pageSize, pageNumber, orderHints, propertyPaths)
82 82
                    //.searchNames(String uninomial,String infraGenericEpithet, String specificEpithet, String infraspecificEpithet, Rank rank, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints,
83 83
            if (potentialParents.size()>1){
84
                for (@SuppressWarnings("rawtypes") TaxonBase potentialParent:potentialParents){
84
                for (@SuppressWarnings("rawtypes") TaxonBase potentialParent : potentialParents){
85 85
                    if (potentialParent.getTitleCache().equals(parentNameString + " sec*")){
86 86
                        classification.addParentChild((Taxon)potentialParent, infraspecificTaxon, null, null);
87 87
                    }
......
99 99
	}
100 100

  
101 101
    private String getParentNameInfraSpecific(TaxonName taxonName){
102
        TaxonName name =  HibernateProxyHelper.deproxy(taxonName);
103
        String parentName = name.getGenusOrUninomial() + " " + name.getSpecificEpithet();
104

  
102
        String parentName = taxonName.getGenusOrUninomial() + " " + taxonName.getSpecificEpithet();
105 103
        return parentName;
106 104
    }
107 105

  

Also available in: Unified diff