Project

General

Profile

Revision 23b77c49

ID23b77c4961c90e82b073646e6c3191fca67b4a47
Parent 7c3a4bab
Child dfeeeb8b

Added by Andreas Müller about 1 year ago

ref #7446 cleanup extension handling a bit

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java
123 123
		new CdmUriMapper("url", "uri"),
124 124
		DbImportExtensionMapper.NewInstance("NomStandard", ExtensionType.NOMENCLATURAL_STANDARD()),
125 125
		DbImportExtensionMapper.NewInstance("DateString", DATE_STRING_UUID, "Date String", "Date String", "dates"),
126
		DbImportExtensionMapper.NewInstance("RefDepositedAt", REF_DEPOSITED_AT_UUID, "RefDepositedAt", "reference is deposited at", "at"),
127
		DbImportExtensionMapper.NewInstance("RefSource", REF_SOURCE_UUID, "RefSource", "reference source", "source"),
126
		DbImportExtensionMapper.NewInstance("RefDepositedAt", REF_DEPOSITED_AT_UUID, "Ref. deposited at", "Reference is deposited at", "at"),
127
		DbImportExtensionMapper.NewInstance("RefSource", REF_SOURCE_UUID, "RefSource", "Reference Source", "source"),
128 128
		DbImportMarkerMapper.NewInstance("isPaper", IS_PAPER_UUID, "is paper", "is paper", "paper", false)
129 129
	};
130 130

  
app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java
17 17
import java.util.Set;
18 18
import java.util.UUID;
19 19

  
20
import org.apache.commons.lang.StringUtils;
21 20
import org.apache.log4j.Logger;
22 21
import org.springframework.stereotype.Component;
23 22

  
......
253 252
					}
254 253
					if (colExists){
255 254
						String sourceAcc = rs.getString("Source_Acc");
256
						if (StringUtils.isNotBlank(sourceAcc)){
255
						if (isNotBlank(sourceAcc)){
257 256
							ExtensionType sourceAccExtensionType = getExtensionType(state, SOURCE_ACC_UUID, "Source_Acc","Source_Acc","Source_Acc");
258
							Extension datesExtension = Extension.NewInstance(taxonName, sourceAcc, sourceAccExtensionType);
257
							Extension.NewInstance(taxonName, sourceAcc, sourceAccExtensionType);
259 258
						}
260 259
					}
261 260

  

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)