Project

General

Profile

« Previous | Next » 

Revision bc556475

Added by Andreas Müller almost 8 years ago

Some further cleaning up for single reference cache strategy #5833

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategy.java
33 33 
import eu.etaxonomy.cdm.model.name.Rank;
34 34 
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
35 35 
import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;
36 
import eu.etaxonomy.cdm.model.reference.Reference;
36 37 
import eu.etaxonomy.cdm.strategy.cache.HTMLTagRules;
37 38 
import eu.etaxonomy.cdm.strategy.cache.TagEnum;
38 39 
import eu.etaxonomy.cdm.strategy.cache.TaggedCacheHelper;
......
333 334 
        //reference
334 335 
        String microReference = nonViralName.getNomenclaturalMicroReference();
335 336 
        INomenclaturalReference ref = nonViralName.getNomenclaturalReference();
336 
        String referenceBaseCache = null;
337 
        String referenceCache = null;
337 338 
        if (ref != null){
338 
            INomenclaturalReference nomenclaturalReference = HibernateProxyHelper.deproxy(ref, INomenclaturalReference.class);
339 
            nomenclaturalReference.setCacheStrategy(nomenclaturalReference.getType().getCacheStrategy());
340 
            referenceBaseCache = nomenclaturalReference.getNomenclaturalCitation(microReference);
339 
            Reference reference = HibernateProxyHelper.deproxy(ref, Reference.class);
340 
            //FIXME #5833 not needed anymore
341 
            reference.setCacheStrategy(reference.getType().getCacheStrategy());
342 
            referenceCache = reference.getNomenclaturalCitation(microReference);
341 343 
        }
342 344 
            //add to tags
343 
        if (StringUtils.isNotBlank(referenceBaseCache)){
344 
            if (! referenceBaseCache.trim().startsWith("in ")){
345 
        if (StringUtils.isNotBlank(referenceCache)){
346 
            if (! referenceCache.trim().startsWith("in ")){
345 347 
                String refConcat = ", ";
346 348 
                tags.add(new TaggedText(TagEnum.separator, refConcat));
347 349 
            }
348 
            tags.add(new TaggedText(TagEnum.reference, referenceBaseCache));
350 
            tags.add(new TaggedText(TagEnum.reference, referenceCache));
349 351 
        }
350 352 

  		




  351
  353
  
    
        //nomenclatural status


  		












Also available in:  Unified diff