Project

General

Profile

« Previous | Next » 

Revision 22e0d6ae

Added by Andreas Müller over 4 years ago

ref #8509 use EnumSet instead of BitSet for source definition

View differences:

cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTaxonExport.java
14 14
import java.sql.SQLException;
15 15
import java.sql.Types;
16 16
import java.util.ArrayList;
17
import java.util.BitSet;
17
import java.util.EnumSet;
18 18
import java.util.HashMap;
19 19
import java.util.Iterator;
20 20
import java.util.List;
......
1366 1366
					addRule(TagEnum.nomStatus, "@status@");
1367 1367

  
1368 1368
			String result;
1369
			if (getSources(taxonName).get(PesiTransformer.SOURCE_ERMS)){
1369
			if (getSources(taxonName).contains(PesiSource.ERMS)){
1370 1370
			    result = cacheStrategy.getTitleCache(taxonName, tagRules);  //according to SQL script (also in ERMS sources are not abbreviated)
1371
			}else if (getSources(taxonName).get(PesiTransformer.SOURCE_EM)){
1371
			}else if (getSources(taxonName).contains(PesiSource.EM)){
1372 1372
			    result = cacheStrategy.getFullTitleCache(taxonName, tagRules);
1373 1373
			}else{
1374 1374
			    //TODO define for FE + IF and for multiple sources
......
1493 1493
			return null;
1494 1494
		}
1495 1495
		String result = null;
1496
		BitSet sources = getSources(taxonName);
1497
		int len = sources.length();
1498
		if(sources.get(PesiTransformer.SOURCE_EM)){
1496
		EnumSet<PesiSource> sources = getSources(taxonName);
1497
		if(sources.contains(PesiSource.EM)){
1499 1498
		    if (! ref.isProtectedAbbrevTitleCache()){
1500 1499
		        ref.setAbbrevTitleCache(null, false);  //to remove a false cache
1501 1500
		    }
1502 1501
		    result = ref.getNomenclaturalCitation(taxonName.getNomenclaturalMicroReference());
1503
		}else if(sources.get(PesiTransformer.SOURCE_FE)||sources.get(PesiTransformer.SOURCE_IF) ){
1502
		}else if(sources.contains(PesiSource.FE)||sources.contains(PesiSource.IF) ){
1504 1503
            //TODO still need to check if correct for FE + IF
1505 1504
		    if (! ref.isProtectedAbbrevTitleCache()){
1506 1505
                ref.setAbbrevTitleCache(null, false);  //to remove a false cache
1507 1506
            }
1508 1507
            result = ref.getNomenclaturalCitation(taxonName.getNomenclaturalMicroReference());
1509 1508
            return result;   // according to SQL script
1510
		}else if(sources.get(PesiTransformer.SOURCE_ERMS)) {
1509
		}else if(sources.contains(PesiSource.ERMS)) {
1511 1510
            //result = null; //according to SQL script
1512 1511
		}else{
1513 1512
		    logger.warn("Source not yet supported");
......
1680 1679
	 * @see MethodMapper
1681 1680
	 */
1682 1681
	private static Integer getQualityStatusFk(TaxonName taxonName) {
1683
		BitSet sources = getSources(taxonName);
1682
	    EnumSet<PesiSource> sources = getSources(taxonName);
1684 1683
		return PesiTransformer.getQualityStatusKeyBySource(sources, taxonName);
1685 1684
	}
1686 1685

  
1687

  
1688 1686
	/**
1689 1687
	 * Returns the <code>QualityStatusCache</code> attribute.
1690 1688
	 * @param taxonName The {@link TaxonNameBase TaxonName}.
......
1937 1935
		String result = "";
1938 1936
		//TODO implement anew for taxa
1939 1937
		try {
1940
			BitSet sources = getSources(taxon);
1938
			EnumSet<PesiSource> sources = getSources(taxon);
1941 1939
			if (sources.isEmpty()) {
1942 1940
//				logger.error("OriginalDB is NULL for this TaxonName: " + taxonName.getUuid() + " (" + taxonName.getTitleCache() + ")");
1943
			} else if (sources.get(PesiTransformer.SOURCE_ERMS)) {
1941
			} else if (sources.contains(PesiSource.ERMS)) {
1944 1942
				Set<Extension> extensions = taxon.getExtensions();
1945 1943
				for (Extension extension : extensions) {
1946 1944
					if (extension.getType().equals(cacheCitationExtensionType)) {
......
1996 1994
	 * @see MethodMapper
1997 1995
	 */
1998 1996
	@SuppressWarnings("unused")
1999
	private static String getOriginalDB(IdentifiableEntity identifiableEntity) {
2000
		BitSet sources  = getSources(identifiableEntity);
1997
	private static String getOriginalDB(IdentifiableEntity<?> identifiableEntity) {
1998
		EnumSet<PesiSource> sources  = getSources(identifiableEntity);
2001 1999
		return PesiTransformer.getOriginalDbBySources(sources);
2002 2000
	}
2003 2001

  

Also available in: Unified diff