Project

General

Profile

« Previous | Next » 

Revision 3f545c52

Added by Andreas Müller over 4 years ago

minor

View differences:

cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/PesiExportActivator.java
121 121
		}
122 122

  
123 123
		// invoke export
124
		CdmDefaultExport<PesiExportConfigurator> pesiExport = new CdmDefaultExport<PesiExportConfigurator>();
124
		CdmDefaultExport<PesiExportConfigurator> pesiExport = new CdmDefaultExport<>();
125 125
		boolean result = pesiExport.invoke(config).isSuccess();
126 126

  
127 127
		System.out.println("End export to PESI ("+ destination.getDatabase() + ")..." + (result? "(successful)":"(with errors)"));
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTaxonExport.java
1564 1564
		if (taxonName == null) {
1565 1565
			return null;
1566 1566
		}else{
1567
		    TaxonName nvn = CdmBase.deproxy(taxonName);
1567 1568
			INonViralNameCacheStrategy cacheStrategy = getCacheStrategy(taxonName);
1568 1569
			HTMLTagRules tagRules = new HTMLTagRules().
1569 1570
					addRule(TagEnum.name, "i").
1570 1571
					addRule(TagEnum.nomStatus, "@status@");
1571 1572

  
1572
			TaxonName nvn = CdmBase.deproxy(taxonName);
1573 1573
			String result = cacheStrategy.getFullTitleCache(nvn, tagRules);
1574 1574
			cacheStrategy = null;
1575
			nvn = null;
1576 1575
			return result.replaceAll(",?\\<@status@\\>.*\\</@status@\\>", "");
1577 1576
		}
1578 1577
	}
......
1669 1668
		if (taxonName != null){
1670 1669
			Reference nomRef = taxonName.getNomenclaturalReference();
1671 1670
			if (nomRef != null){
1671
			    //#5388 is definetely not the correct ticket number
1672 1672
			    logger.warn("Semantics of getAbbrevTitleCache has changed. Please check if output is still correct. See #5388");
1673 1673
				return nomRef.getAbbrevTitleCache();
1674 1674
			}
......
2510 2510
		mapping.addMapper(MethodMapper.NewInstance("WebShowName", this, TaxonName.class));
2511 2511
		mapping.addMapper(MethodMapper.NewInstance("GUID", this, TaxonName.class));
2512 2512

  
2513

  
2514

  
2515 2513
		// DisplayName
2516 2514
		mapping.addMapper(MethodMapper.NewInstance("DisplayName", this, TaxonName.class));
2517 2515

  

Also available in: Unified diff