Revision 064fbac0
Added by Andreas Müller about 3 years ago
| app-import/pom.xml | ||
|---|---|---|
| 7 | 7 |
|
| 8 | 8 |
<groupId>eu.etaxonomy</groupId> |
| 9 | 9 |
<artifactId>imports</artifactId> |
| 10 |
<version>5.19.0-SNAPSHOT</version>
|
|
| 10 |
<version>5.22.0-SNAPSHOT</version>
|
|
| 11 | 11 |
|
| 12 | 12 |
<name>App Import</name> |
| 13 | 13 |
<description>A collection of diverse imports to the EDIT CDM Platform</description> |
| cdm-eflora/pom.xml | ||
|---|---|---|
| 9 | 9 |
|
| 10 | 10 |
<groupId>eu.etaxonomy.cdm</groupId> |
| 11 | 11 |
<artifactId>cdm-eflora</artifactId> |
| 12 |
<version>5.19.0-SNAPSHOT</version>
|
|
| 12 |
<version>5.22.0-SNAPSHOT</version>
|
|
| 13 | 13 |
|
| 14 | 14 |
<name>CDM e-Flora</name> |
| 15 |
<description>The e-Flora package for e-FLora imports to the EDIT CDM Platform</description>
|
|
| 15 |
<description>The e-Flora package for e-Flora imports to the EDIT CDM Platform</description>
|
|
| 16 | 16 |
|
| 17 | 17 |
<properties> |
| 18 | 18 |
<java.codelevel>1.8</java.codelevel> |
| cdm-eflora/src/main/java/eu/etaxonomy/cdm/io/eflora/EfloraTaxonImport.java | ||
|---|---|---|
| 46 | 46 |
import eu.etaxonomy.cdm.model.common.Marker; |
| 47 | 47 |
import eu.etaxonomy.cdm.model.common.MarkerType; |
| 48 | 48 |
import eu.etaxonomy.cdm.model.common.TimePeriod; |
| 49 |
import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod; |
|
| 49 | 50 |
import eu.etaxonomy.cdm.model.description.CommonTaxonName; |
| 50 | 51 |
import eu.etaxonomy.cdm.model.description.DescriptionElementBase; |
| 51 | 52 |
import eu.etaxonomy.cdm.model.description.Feature; |
| ... | ... | |
| 441 | 442 |
*/ |
| 442 | 443 |
private void handleKeychoiceNum(UnmatchedLeads openKeys, PolytomousKey key, Element elKeychoice, List<PolytomousKeyNode> childNodes) {
|
| 443 | 444 |
Attribute numAttr = elKeychoice.getAttribute("num");
|
| 444 |
String num = CdmUtils.removeTrailingDot(numAttr == null? "":numAttr.getValue()); |
|
| 445 |
String num = CdmUtils.removeTrailingDots(numAttr == null? "":numAttr.getValue());
|
|
| 445 | 446 |
UnmatchedLeadsKey okk = UnmatchedLeadsKey.NewInstance(key, num); |
| 446 | 447 |
Set<PolytomousKeyNode> matchingNodes = openKeys.getNodes(okk); |
| 447 | 448 |
for (PolytomousKeyNode matchingNode : matchingNodes){
|
| ... | ... | |
| 2218 | 2219 |
startMonth = getMonth(strPeriod.substring(0, end)); |
| 2219 | 2220 |
} |
| 2220 | 2221 |
|
| 2221 |
TimePeriod datePublished = TimePeriodParser.parseString(strPeriod);
|
|
| 2222 |
VerbatimTimePeriod datePublished = TimePeriodParser.parseStringVerbatim(strPeriod);
|
|
| 2222 | 2223 |
if (startMonth != null){
|
| 2223 | 2224 |
datePublished.setStartMonth(startMonth); |
| 2224 | 2225 |
} |
| 2225 | 2226 |
ref.setDatePublished(datePublished); |
| 2226 | 2227 |
ref.setTitle(title); |
| 2227 |
detailResult = CdmUtils.removeTrailingDot(detail); |
|
| 2228 |
detailResult = CdmUtils.removeTrailingDots(detail);
|
|
| 2228 | 2229 |
if (detailResult.endsWith(".") || detailResult.endsWith(";") || detailResult.endsWith(",") ){
|
| 2229 | 2230 |
detailResult = detailResult.substring(0, detailResult.length() -1); |
| 2230 | 2231 |
} |
| cdm-eflora/src/main/java/eu/etaxonomy/cdm/io/eflora/centralAfrica/checklist/CentralAfricaChecklistImportBase.java | ||
|---|---|---|
| 212 | 212 |
|
| 213 | 213 |
|
| 214 | 214 |
//notes |
| 215 |
if (CdmUtils.isNotEmpty(notes)){
|
|
| 215 |
if (isNotBlank(notes)){
|
|
| 216 | 216 |
String notesString = String.valueOf(notes); |
| 217 | 217 |
if (notesString.length() > 65530 ){
|
| 218 | 218 |
notesString = notesString.substring(0, 65530) + "..."; |
| cdm-pesi/pom.xml | ||
|---|---|---|
| 12 | 12 |
|
| 13 | 13 |
<groupId>eu.etaxonomy.cdm</groupId> |
| 14 | 14 |
<artifactId>cdm-pesi</artifactId> |
| 15 |
<version>5.19.0-SNAPSHOT</version>
|
|
| 15 |
<version>5.22.0-SNAPSHOT</version>
|
|
| 16 | 16 |
|
| 17 | 17 |
<name>CDM PESI</name> |
| 18 | 18 |
<description>The PESI package for EDIT's CdmLibrary</description> |
Also available in: Unified diff
update pom and cleanup