Revision b0b44252
Added by Andreas Müller almost 6 years ago
| app-import/src/main/java/eu/etaxonomy/cdm/app/bogota/BogotaChecklistActivator.java | ||
|---|---|---|
| 101 | 101 |
result.setPlacePublished("Bogotá");
|
| 102 | 102 |
result.setUri(URI.create("http://catalogoplantasdecolombia.unal.edu.co/"));
|
| 103 | 103 |
result.setPublisher("Instituto de Ciencias Naturales, Universidad Nacional de Colombia");
|
| 104 |
result.setDatePublished(TimePeriodParser.parseString("2016"));
|
|
| 104 |
result.setDatePublished(TimePeriodParser.parseStringVerbatim("2016"));
|
|
| 105 | 105 |
result.getDatePublished().setFreeText("2016 (visited 2017-04-19)");
|
| 106 | 106 |
|
| 107 | 107 |
Team team = Team.NewInstance(); |
| app-import/src/main/java/eu/etaxonomy/cdm/app/bogota/BogotaSpecimenActivator.java | ||
|---|---|---|
| 108 | 108 |
// result.setTitleCache("Herbario. 2017. Identificaciones de muestras de herbario en el banco de datos del Jardín Botánico Nacional José Celestino Mutis. Bogotá [exportados 18-sep-2017]", true);
|
| 109 | 109 |
result.setTitle("Identificaciones de muestras de herbario en el banco de datos del Jardín Botánico Nacional José Celestino Mutis.");
|
| 110 | 110 |
result.setPlacePublished("Bogotá");
|
| 111 |
result.setDatePublished(TimePeriodParser.parseString("2017"));
|
|
| 111 |
result.setDatePublished(TimePeriodParser.parseStringVerbatim("2017"));
|
|
| 112 | 112 |
result.getDatePublished().setFreeText("2017 [exportados 18-sep-2017]");
|
| 113 | 113 |
|
| 114 | 114 |
Team team = Team.NewTitledInstance("Herbario", null);
|
| app-import/src/main/java/eu/etaxonomy/cdm/app/greece/GreeceActivator.java | ||
|---|---|---|
| 97 | 97 |
} |
| 98 | 98 |
Reference result = ReferenceFactory.newBook(); |
| 99 | 99 |
result.setTitle("Vascular plants of Greece: An annotated checklist.");
|
| 100 |
result.setDatePublished(TimePeriodParser.parseString("2013"));
|
|
| 100 |
result.setDatePublished(TimePeriodParser.parseStringVerbatim("2013"));
|
|
| 101 | 101 |
|
| 102 | 102 |
Team team = Team.NewInstance(); |
| 103 | 103 |
|
| ... | ... | |
| 158 | 158 |
private Reference getSecReference2(){
|
| 159 | 159 |
Reference result = ReferenceFactory.newArticle(); |
| 160 | 160 |
result.setTitle("Vascular plants of Greece: An annotated checklist. Supplement");
|
| 161 |
result.setDatePublished(TimePeriodParser.parseString("26.10.2016"));
|
|
| 161 |
result.setDatePublished(TimePeriodParser.parseStringVerbatim("26.10.2016"));
|
|
| 162 | 162 |
|
| 163 | 163 |
TeamOrPersonBase<?> team = getSecReference().getAuthorship(); |
| 164 | 164 |
result.setAuthorship(team); |
| app-import/src/main/java/eu/etaxonomy/cdm/app/iapt/IAPTActivator.java | ||
|---|---|---|
| 14 | 14 |
import java.net.URISyntaxException; |
| 15 | 15 |
import java.util.UUID; |
| 16 | 16 |
|
| 17 |
import eu.etaxonomy.cdm.common.monitor.DefaultProgressMonitor; |
|
| 18 |
import eu.etaxonomy.cdm.database.DatabaseTypeEnum; |
|
| 19 |
import eu.etaxonomy.cdm.model.common.TimePeriod; |
|
| 20 | 17 |
import org.apache.log4j.Logger; |
| 21 | 18 |
|
| 22 | 19 |
import eu.etaxonomy.cdm.app.common.CdmDestinations; |
| 20 |
import eu.etaxonomy.cdm.common.monitor.DefaultProgressMonitor; |
|
| 21 |
import eu.etaxonomy.cdm.database.DatabaseTypeEnum; |
|
| 23 | 22 |
import eu.etaxonomy.cdm.database.DbSchemaValidation; |
| 24 | 23 |
import eu.etaxonomy.cdm.database.ICdmDataSource; |
| 25 | 24 |
import eu.etaxonomy.cdm.io.common.CdmDefaultImport; |
| 26 | 25 |
import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK; |
| 27 | 26 |
import eu.etaxonomy.cdm.io.iapt.IAPTImportConfigurator; |
| 27 |
import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod; |
|
| 28 | 28 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| 29 | 29 |
import eu.etaxonomy.cdm.model.reference.ReferenceFactory; |
| 30 | 30 |
|
| ... | ... | |
| 85 | 85 |
|
| 86 | 86 |
Reference sourceRef = ReferenceFactory.newDatabase(); |
| 87 | 87 |
sourceRef.setTitle("IAPT Registration of Plant Names Database");
|
| 88 |
sourceRef.setDatePublished(TimePeriod.NewInstance(1998, 2016));
|
|
| 88 |
sourceRef.setDatePublished(VerbatimTimePeriod.NewVerbatimInstance(1998, 2016));
|
|
| 89 | 89 |
sourceRef.setOrganization("International Association for Plant Taxonomy");
|
| 90 | 90 |
try {
|
| 91 | 91 |
sourceRef.setUri(new URI("http://archive.bgbm.org/scripts/ASP/registration/regSearch.asp"));
|
| app-import/src/main/java/eu/etaxonomy/cdm/app/mexico/MexicoBorhidiActivator.java | ||
|---|---|---|
| 114 | 114 |
result.setPlacePublished("Budapest");
|
| 115 | 115 |
result.setPublisher("Akadémiai Kiadó");
|
| 116 | 116 |
result.setPages("608 pp.");
|
| 117 |
result.setDatePublished(TimePeriodParser.parseString("2012"));
|
|
| 117 |
result.setDatePublished(TimePeriodParser.parseStringVerbatim("2012"));
|
|
| 118 | 118 |
Person borhidi = Person.NewTitledInstance("Borhidi");
|
| 119 | 119 |
borhidi.setGivenName("Attila");
|
| 120 | 120 |
result.setAuthorship(borhidi); |
| app-import/src/main/java/eu/etaxonomy/cdm/app/mexico/MexicoConabioActivator.java | ||
|---|---|---|
| 25 | 25 |
import eu.etaxonomy.cdm.model.agent.Person; |
| 26 | 26 |
import eu.etaxonomy.cdm.model.common.Language; |
| 27 | 27 |
import eu.etaxonomy.cdm.model.common.Representation; |
| 28 |
import eu.etaxonomy.cdm.model.common.TimePeriod; |
|
| 28 |
import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
|
|
| 29 | 29 |
import eu.etaxonomy.cdm.model.description.Feature; |
| 30 | 30 |
import eu.etaxonomy.cdm.model.description.FeatureNode; |
| 31 | 31 |
import eu.etaxonomy.cdm.model.description.FeatureTree; |
| ... | ... | |
| 108 | 108 |
private Reference getSourceReference() {
|
| 109 | 109 |
Reference result = ReferenceFactory.newDatabase(); |
| 110 | 110 |
result.setTitleCache("CONABIO database", true);
|
| 111 |
TimePeriod tp = TimePeriodParser.parseString("2016");
|
|
| 111 |
VerbatimTimePeriod tp = TimePeriodParser.parseStringVerbatim("2016");
|
|
| 112 | 112 |
tp.setStartMonth(5); |
| 113 | 113 |
result.setDatePublished(tp); |
| 114 | 114 |
Institution inst = Institution.NewNamedInstance("CONABIO");
|
| ... | ... | |
| 119 | 119 |
private Reference getSecReference() {
|
| 120 | 120 |
Reference result = ReferenceFactory.newDatabase(); |
| 121 | 121 |
result.setTitle("Rubiáceas de México");
|
| 122 |
result.setDatePublished(TimePeriodParser.parseString("2016"));
|
|
| 122 |
result.setDatePublished(TimePeriodParser.parseStringVerbatim("2016"));
|
|
| 123 | 123 |
Person author = Person.NewInstance(); |
| 124 | 124 |
author.setGivenName("Helga");
|
| 125 | 125 |
author.setFamilyName("Ochoterena Booth");
|
| app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsRdfTestActivator.java | ||
|---|---|---|
| 92 | 92 |
IReferenceService refService = tcsImport.getCdmAppController().getReferenceService(); |
| 93 | 93 |
IBook book = ReferenceFactory.newBook(); |
| 94 | 94 |
//book.setDatePublished(TimePeriod.NewInstance(1945)); |
| 95 |
book.setDatePublished(TimePeriod.NewInstance(1945).setEndDay(12).setEndMonth(4)); |
|
| 95 |
book.setDatePublished(TimePeriod.NewInstance(1945).setEndDay(12).setEndMonth(4).toVerbatim());
|
|
| 96 | 96 |
refService.saveOrUpdate((Reference)book); |
| 97 | 97 |
logger.info("End");
|
| 98 | 98 |
System.out.println("End import from TCS ("+ source.toString() + ")...");
|
| app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/UseImport.java | ||
|---|---|---|
| 54 | 54 |
import eu.etaxonomy.cdm.model.common.MarkerType; |
| 55 | 55 |
import eu.etaxonomy.cdm.model.common.TermType; |
| 56 | 56 |
import eu.etaxonomy.cdm.model.common.TermVocabulary; |
| 57 |
import eu.etaxonomy.cdm.model.common.TimePeriod; |
|
| 57 |
import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
|
|
| 58 | 58 |
import eu.etaxonomy.cdm.model.description.CategoricalData; |
| 59 | 59 |
import eu.etaxonomy.cdm.model.description.Feature; |
| 60 | 60 |
import eu.etaxonomy.cdm.model.description.FeatureNode; |
| ... | ... | |
| 187 | 187 |
citation.setTitle(lstUpdate.get(4)); |
| 188 | 188 |
|
| 189 | 189 |
//citation. |
| 190 |
TimePeriod year = TimePeriod.NewInstance(Integer.parseInt(lstUpdate.get(5)));
|
|
| 190 |
VerbatimTimePeriod year = VerbatimTimePeriod.NewVerbatimInstance(Integer.parseInt(lstUpdate.get(5)));
|
|
| 191 | 191 |
citation.setDatePublished(year); |
| 192 |
citation.setTitleCache(lstUpdate.get(6)); |
|
| 192 |
citation.setTitleCache(lstUpdate.get(6), true);
|
|
| 193 | 193 |
//citation. |
| 194 | 194 |
for(TaxonBase taxon : taxa) {
|
| 195 | 195 |
String taxonUUID = taxon.getUuid().toString(); |
| ... | ... | |
| 197 | 197 |
if(idTaxonToUpdate.equals(taxonUUID)) {
|
| 198 | 198 |
logger.info("Processing Taxn " + taxon.getTitleCache() + " with UUID: " + taxon.getUuid());
|
| 199 | 199 |
if(taxon.isInstanceOf(Synonym.class)) {
|
| 200 |
Taxon bestCandidate = null; |
|
| 201 | 200 |
Synonym synonym = CdmBase.deproxy(taxon, Synonym.class); |
| 202 | 201 |
Taxon acceptetdTaxon = synonym.getAcceptedTaxon(); |
| 203 | 202 |
if(acceptetdTaxon != null){
|
| app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelFactsImport.java | ||
|---|---|---|
| 970 | 970 |
vol2.setAuthorship(team1); |
| 971 | 971 |
vol3.setAuthorship(team2); |
| 972 | 972 |
|
| 973 |
vol1.setDatePublished(TimePeriodParser.parseString("2009"));
|
|
| 974 |
vol2.setDatePublished(TimePeriodParser.parseString("2012"));
|
|
| 975 |
vol3.setDatePublished(TimePeriodParser.parseString("2016"));
|
|
| 973 |
vol1.setDatePublished(TimePeriodParser.parseStringVerbatim("2009"));
|
|
| 974 |
vol2.setDatePublished(TimePeriodParser.parseStringVerbatim("2012"));
|
|
| 975 |
vol3.setDatePublished(TimePeriodParser.parseStringVerbatim("2016"));
|
|
| 976 | 976 |
|
| 977 | 977 |
Reference englera = ReferenceFactory.newPrintSeries("Englera");
|
| 978 | 978 |
vol1.setInSeries(englera); |
| app-import/src/main/java/eu/etaxonomy/cdm/io/caryo/CaryoTaxonImport.java | ||
|---|---|---|
| 30 | 30 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| 31 | 31 |
import eu.etaxonomy.cdm.model.common.Language; |
| 32 | 32 |
import eu.etaxonomy.cdm.model.common.OriginalSourceType; |
| 33 |
import eu.etaxonomy.cdm.model.common.TimePeriod; |
|
| 33 |
import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
|
|
| 34 | 34 |
import eu.etaxonomy.cdm.model.name.IBotanicalName; |
| 35 | 35 |
import eu.etaxonomy.cdm.model.name.NameTypeDesignation; |
| 36 | 36 |
import eu.etaxonomy.cdm.model.name.NomenclaturalStatus; |
| ... | ... | |
| 358 | 358 |
} |
| 359 | 359 |
|
| 360 | 360 |
private void makeDate(CaryoImportState state, ResultSet rs, INomenclaturalReference ref, Integer id) throws SQLException {
|
| 361 |
TimePeriod tp = TimePeriod.NewInstance();
|
|
| 361 |
VerbatimTimePeriod tp = VerbatimTimePeriod.NewVerbatimInstance();
|
|
| 362 | 362 |
String pre1 = rs.getString("DatePre1");
|
| 363 | 363 |
String pre2 = rs.getString("DatePre2");
|
| 364 | 364 |
Float year1 = nullSafeFloat(rs, "DateYear1"); |
| app-import/src/main/java/eu/etaxonomy/cdm/io/cuba/CubaVocabularyImport.java | ||
|---|---|---|
| 85 | 85 |
asTeam.addTeamMember(acevedo); |
| 86 | 86 |
asTeam.addTeamMember(strong); |
| 87 | 87 |
refAS.setAuthorship(asTeam); |
| 88 |
refAS.setDatePublished(TimePeriodParser.parseString("2012-01-01"));
|
|
| 88 |
refAS.setDatePublished(TimePeriodParser.parseStringVerbatim("2012-01-01"));
|
|
| 89 | 89 |
refAS.setVolume("98");
|
| 90 | 90 |
refAS.setPages("i-xxv, 1-1192");
|
| 91 | 91 |
refAS.setIssn("0081-024X");
|
| app-import/src/main/java/eu/etaxonomy/cdm/io/edaphobase/EdaphobaseReferenceImport.java | ||
|---|---|---|
| 24 | 24 |
import eu.etaxonomy.cdm.io.common.ImportHelper; |
| 25 | 25 |
import eu.etaxonomy.cdm.io.common.ResultSetPartitioner; |
| 26 | 26 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| 27 |
import eu.etaxonomy.cdm.model.common.TimePeriod; |
|
| 27 |
import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
|
|
| 28 | 28 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| 29 | 29 |
import eu.etaxonomy.cdm.model.reference.ReferenceFactory; |
| 30 | 30 |
|
| ... | ... | |
| 150 | 150 |
ref.setPages(pageStr); |
| 151 | 151 |
} |
| 152 | 152 |
if (year != null){
|
| 153 |
ref.setDatePublished(TimePeriod.NewInstance(year));
|
|
| 153 |
ref.setDatePublished(VerbatimTimePeriod.NewVerbatimInstance(year));
|
|
| 154 | 154 |
} |
| 155 | 155 |
ref.setVolume(volume); |
| 156 | 156 |
ref.setReferenceAbstract(abstractt); |
| app-import/src/main/java/eu/etaxonomy/cdm/io/globis/GlobisCommonNameImport.java | ||
|---|---|---|
| 26 | 26 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| 27 | 27 |
import eu.etaxonomy.cdm.model.common.Language; |
| 28 | 28 |
import eu.etaxonomy.cdm.model.common.OriginalSourceType; |
| 29 |
import eu.etaxonomy.cdm.model.common.TimePeriod; |
|
| 29 |
import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
|
|
| 30 | 30 |
import eu.etaxonomy.cdm.model.description.CommonTaxonName; |
| 31 | 31 |
import eu.etaxonomy.cdm.model.description.TaxonDescription; |
| 32 | 32 |
import eu.etaxonomy.cdm.model.location.Country; |
| ... | ... | |
| 193 | 193 |
result = ReferenceFactory.newGeneric(); |
| 194 | 194 |
result.setTitleCache(details, true); |
| 195 | 195 |
result.setTitle(title); |
| 196 |
result.setDatePublished(TimePeriod.NewInstance(year));
|
|
| 196 |
result.setDatePublished(VerbatimTimePeriod.NewVerbatimInstance(year));
|
|
| 197 | 197 |
|
| 198 | 198 |
TeamOrPersonBase<?> author; |
| 199 | 199 |
String[] authorSplit = authors.split("&");
|
| app-import/src/main/java/eu/etaxonomy/cdm/io/globis/GlobisReferenceImport.java | ||
|---|---|---|
| 214 | 214 |
//RefYear |
| 215 | 215 |
//TODO check correct parsing for [] and full dates |
| 216 | 216 |
if (isNotBlank(refYear)){
|
| 217 |
ref.setDatePublished(TimePeriodParser.parseString(refYear)); |
|
| 217 |
ref.setDatePublished(TimePeriodParser.parseStringVerbatim(refYear));
|
|
| 218 | 218 |
} |
| 219 | 219 |
|
| 220 | 220 |
//refPages |
| app-import/src/main/java/eu/etaxonomy/cdm/io/greece/FloraHellenicaExcludedTaxonImport.java | ||
|---|---|---|
| 18 | 18 |
|
| 19 | 19 |
import eu.etaxonomy.cdm.io.mexico.SimpleExcelTaxonImportState; |
| 20 | 20 |
import eu.etaxonomy.cdm.model.agent.Person; |
| 21 |
import eu.etaxonomy.cdm.model.common.TimePeriod; |
|
| 21 |
import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
|
|
| 22 | 22 |
import eu.etaxonomy.cdm.model.name.IBotanicalName; |
| 23 | 23 |
import eu.etaxonomy.cdm.model.name.INonViralName; |
| 24 | 24 |
import eu.etaxonomy.cdm.model.name.NomenclaturalCode; |
| ... | ... | |
| 148 | 148 |
Person hayek = Person.NewInstance(); |
| 149 | 149 |
hayek.setFamilyName("Hayek");
|
| 150 | 150 |
ref.setAuthorship(hayek); |
| 151 |
ref.setDatePublished(TimePeriod.NewInstance(1929));
|
|
| 151 |
ref.setDatePublished(VerbatimTimePeriod.NewVerbatimInstance(1929));
|
|
| 152 | 152 |
return ref; |
| 153 | 153 |
} |
| 154 | 154 |
|
| app-import/src/main/java/eu/etaxonomy/cdm/io/greece/FloraHellenicaImageImport.java | ||
|---|---|---|
| 33 | 33 |
import eu.etaxonomy.cdm.model.agent.Person; |
| 34 | 34 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| 35 | 35 |
import eu.etaxonomy.cdm.model.common.Language; |
| 36 |
import eu.etaxonomy.cdm.model.common.TimePeriod; |
|
| 36 | 37 |
import eu.etaxonomy.cdm.model.description.Feature; |
| 37 | 38 |
import eu.etaxonomy.cdm.model.description.TaxonDescription; |
| 38 | 39 |
import eu.etaxonomy.cdm.model.description.TextData; |
| ... | ... | |
| 150 | 151 |
}else if ("date time original".equalsIgnoreCase(item.getKeyword())){
|
| 151 | 152 |
DateTimeFormatter f = DateTimeFormat.forPattern("yyyy:MM:dd HH:mm:ss");
|
| 152 | 153 |
DateTime created = f.withZone(DateTimeZone.forID("Europe/Athens")).parseDateTime(value);
|
| 153 |
media.setMediaCreated(created);
|
|
| 154 |
media.setMediaCreated(TimePeriod.NewInstance(created));
|
|
| 154 | 155 |
} |
| 155 | 156 |
} |
| 156 | 157 |
} catch (ImageReadException | IOException e1) {
|
| app-import/src/main/java/eu/etaxonomy/cdm/io/iapt/IAPTExcelImport.java | ||
|---|---|---|
| 52 | 52 |
import eu.etaxonomy.cdm.model.common.Marker; |
| 53 | 53 |
import eu.etaxonomy.cdm.model.common.MarkerType; |
| 54 | 54 |
import eu.etaxonomy.cdm.model.common.OriginalSourceType; |
| 55 |
import eu.etaxonomy.cdm.model.common.TimePeriod; |
|
| 55 |
import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
|
|
| 56 | 56 |
import eu.etaxonomy.cdm.model.name.IBotanicalName; |
| 57 | 57 |
import eu.etaxonomy.cdm.model.name.NameRelationshipType; |
| 58 | 58 |
import eu.etaxonomy.cdm.model.name.NameTypeDesignation; |
| ... | ... | |
| 262 | 262 |
if(bookVariedadesTradicionales == null){
|
| 263 | 263 |
bookVariedadesTradicionales = ReferenceFactory.newBook(); |
| 264 | 264 |
bookVariedadesTradicionales.setTitle("Las variedades tradicionales de frutales de la Cuenca del Río Segura. Catálogo Etnobotánico (1): Frutos secos, oleaginosos, frutales de hueso, almendros y frutales de pepita");
|
| 265 |
bookVariedadesTradicionales.setDatePublished(TimePeriod.NewInstance(1997));
|
|
| 265 |
bookVariedadesTradicionales.setDatePublished(VerbatimTimePeriod.NewVerbatimInstance(1997));
|
|
| 266 | 266 |
getReferenceService().save(bookVariedadesTradicionales); |
| 267 | 267 |
} |
| 268 | 268 |
nomRefStr = nomRefStr.replaceAll("^.*?\\:.*?\\:", "Las variedades tradicionales:");
|
| ... | ... | |
| 302 | 302 |
|
| 303 | 303 |
if(taxonName.getNomenclaturalReference() != null){
|
| 304 | 304 |
if(pupDate != null) {
|
| 305 |
taxonName.getNomenclaturalReference().setDatePublished(TimePeriod.NewInstance(pupDate));
|
|
| 305 |
taxonName.getNomenclaturalReference().setDatePublished(VerbatimTimePeriod.NewVerbatimInstance(pupDate));
|
|
| 306 | 306 |
} |
| 307 | 307 |
if(nomRefIssue != null) {
|
| 308 |
((Reference)taxonName.getNomenclaturalReference()).setVolume(nomRefIssue);
|
|
| 308 |
taxonName.getNomenclaturalReference().setVolume(nomRefIssue);
|
|
| 309 | 309 |
} |
| 310 | 310 |
} |
| 311 | 311 |
|
| app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoBorhidiExcelImport.java | ||
|---|---|---|
| 177 | 177 |
article.setInReference(journal); |
| 178 | 178 |
|
| 179 | 179 |
titleYear = (isBlank(publishedYear)? titleYear : UTF8.QUOT_DBL_LOW9 + titleYear + UTF8.QUOT_DBL_HIGH_REV9 + "[" + publishedYear + "]"); |
| 180 |
article.setDatePublished(TimePeriodParser.parseString(titleYear)); |
|
| 180 |
article.setDatePublished(TimePeriodParser.parseStringVerbatim(titleYear));
|
|
| 181 | 181 |
|
| 182 | 182 |
article.setAuthorship(name.getCombinationAuthorship()); |
| 183 | 183 |
|
| ... | ... | |
| 199 | 199 |
|
| 200 | 200 |
//year |
| 201 | 201 |
titleYear = (isBlank(publishedYear)? titleYear : UTF8.QUOT_DBL_LOW9 + titleYear + UTF8.QUOT_DBL_HIGH_REV9 + "[" + publishedYear + "]"); |
| 202 |
book.setDatePublished(TimePeriodParser.parseString(titleYear)); |
|
| 202 |
book.setDatePublished(TimePeriodParser.parseStringVerbatim(titleYear));
|
|
| 203 | 203 |
|
| 204 | 204 |
book.setAuthorship(name.getCombinationAuthorship()); |
| 205 | 205 |
|
| app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioTaxonImport.java | ||
|---|---|---|
| 30 | 30 |
import eu.etaxonomy.cdm.model.common.Extension; |
| 31 | 31 |
import eu.etaxonomy.cdm.model.common.ExtensionType; |
| 32 | 32 |
import eu.etaxonomy.cdm.model.common.Language; |
| 33 |
import eu.etaxonomy.cdm.model.common.TimePeriod; |
|
| 33 |
import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
|
|
| 34 | 34 |
import eu.etaxonomy.cdm.model.name.IBotanicalName; |
| 35 | 35 |
import eu.etaxonomy.cdm.model.name.NomenclaturalCode; |
| 36 | 36 |
import eu.etaxonomy.cdm.model.name.NomenclaturalStatus; |
| ... | ... | |
| 159 | 159 |
Reference result = state.getReference(secRefStr); |
| 160 | 160 |
if (result == null && secRefStr != null){
|
| 161 | 161 |
result = ReferenceFactory.newBook(); |
| 162 |
TimePeriod tp = TimePeriodParser.parseString(secRefStr.substring(secRefStr.length()-4));
|
|
| 162 |
VerbatimTimePeriod tp = TimePeriodParser.parseStringVerbatim(secRefStr.substring(secRefStr.length()-4));
|
|
| 163 | 163 |
String authorStrPart = secRefStr.substring(0, secRefStr.length()-6); |
| 164 | 164 |
if (! (authorStrPart + ", " + tp.getYear()).equals(secRefStr)){
|
| 165 | 165 |
logger.warn(line + "Sec ref could not be parsed: " + secRefStr); |
| ... | ... | |
| 303 | 303 |
* @param state |
| 304 | 304 |
*/ |
| 305 | 305 |
private void addSourcesToReferences(IBotanicalName name, SimpleExcelTaxonImportState<CONFIG> state) {
|
| 306 |
Reference nomRef = (Reference)name.getNomenclaturalReference();
|
|
| 306 |
Reference nomRef = name.getNomenclaturalReference(); |
|
| 307 | 307 |
if (nomRef != null){
|
| 308 | 308 |
nomRef.addSource(makeOriginalSource(state)); |
| 309 | 309 |
if (nomRef.getInReference() != null){
|
| app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/bfnXml/in/BfnXmlImportMetaData.java | ||
|---|---|---|
| 20 | 20 |
import eu.etaxonomy.cdm.common.ResultWrapper; |
| 21 | 21 |
import eu.etaxonomy.cdm.io.common.ICdmIO; |
| 22 | 22 |
import eu.etaxonomy.cdm.io.redlist.bfnXml.BfnXmlConstants; |
| 23 |
import eu.etaxonomy.cdm.model.common.TimePeriod; |
|
| 23 |
import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
|
|
| 24 | 24 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| 25 | 25 |
import eu.etaxonomy.cdm.model.reference.ReferenceFactory; |
| 26 | 26 |
import eu.etaxonomy.cdm.strategy.parser.TimePeriodParser; |
| ... | ... | |
| 76 | 76 |
|
| 77 | 77 |
Reference sourceReference = ReferenceFactory.newGeneric(); |
| 78 | 78 |
sourceReference.setTitle(sourceFileName); |
| 79 |
TimePeriod parsedTimePeriod = TimePeriodParser.parseString(timeStamp);
|
|
| 79 |
VerbatimTimePeriod parsedTimePeriod = TimePeriodParser.parseStringVerbatim(timeStamp);
|
|
| 80 | 80 |
sourceReference.setDatePublished(parsedTimePeriod); |
| 81 | 81 |
state.setCompleteSourceRef(sourceReference); |
| 82 | 82 |
} |
| app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListGefaesspflanzenImportClassification.java | ||
|---|---|---|
| 29 | 29 |
import eu.etaxonomy.cdm.io.common.ResultSetPartitioner; |
| 30 | 30 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| 31 | 31 |
import eu.etaxonomy.cdm.model.common.Language; |
| 32 |
import eu.etaxonomy.cdm.model.common.TimePeriod; |
|
| 32 |
import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
|
|
| 33 | 33 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| 34 | 34 |
import eu.etaxonomy.cdm.model.reference.ReferenceFactory; |
| 35 | 35 |
import eu.etaxonomy.cdm.model.taxon.Classification; |
| ... | ... | |
| 40 | 40 |
import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType; |
| 41 | 41 |
|
| 42 | 42 |
/** |
| 43 |
* |
|
| 44 | 43 |
* @author pplitzner |
| 45 | 44 |
* @since Mar 1, 2016 |
| 46 |
* |
|
| 47 | 45 |
*/ |
| 48 | 46 |
|
| 49 | 47 |
@Component |
| ... | ... | |
| 236 | 234 |
private void addTaxonToClassification(Classification classification, String classificationNamespace, String relationString, final TaxonBase<?> gesamtListeTaxon, long id, RedListGefaesspflanzenImportState state){
|
| 237 | 235 |
Taxon taxon = HibernateProxyHelper.deproxy(state.getRelatedObject(classificationNamespace, String.valueOf(id), TaxonBase.class), Taxon.class); |
| 238 | 236 |
//add concept relation to gesamtliste/checkliste |
| 239 |
if(taxon!=null && CdmUtils.isNotBlank(relationString) && !relationString.equals(".")){
|
|
| 237 |
if(taxon!=null && isNotBlank(relationString) && !relationString.equals(".")){
|
|
| 240 | 238 |
//if the related concept in gesamtliste/checkliste is a synonym then we |
| 241 | 239 |
//create a relation to the accepted taxon |
| 242 | 240 |
Taxon acceptedGesamtListeTaxon = getAcceptedTaxon(gesamtListeTaxon); |
| ... | ... | |
| 286 | 284 |
classification.addParentChild(parent, (Taxon)taxonBase, null, null); |
| 287 | 285 |
} |
| 288 | 286 |
|
| 289 |
if(CdmUtils.isNotBlank(taxZusatzString)){
|
|
| 287 |
if(isNotBlank(taxZusatzString)){
|
|
| 290 | 288 |
if(taxZusatzString.trim().equals("p. p.")){
|
| 291 | 289 |
RedListUtil.logMessage(id, "pro parte for accepted taxon "+taxonBase, logger); |
| 292 | 290 |
} |
| ... | ... | |
| 306 | 304 |
//regular synonym |
| 307 | 305 |
else{
|
| 308 | 306 |
Synonym synonym = (Synonym) taxonBase; |
| 309 |
parent.addSynonym((Synonym) taxonBase, SynonymType.HETEROTYPIC_SYNONYM_OF());
|
|
| 307 |
parent.addSynonym(synonym, SynonymType.HETEROTYPIC_SYNONYM_OF());
|
|
| 310 | 308 |
|
| 311 | 309 |
//TAX_ZUSATZ |
| 312 |
if(CdmUtils.isNotBlank(taxZusatzString)){
|
|
| 310 |
if(isNotBlank(taxZusatzString)){
|
|
| 313 | 311 |
if(taxZusatzString.trim().equals("p. p.")){
|
| 314 | 312 |
synonym.setProParte(true); |
| 315 | 313 |
} |
| ... | ... | |
| 378 | 376 |
reference.setUuid(referenceUuid); |
| 379 | 377 |
classification.setReference(reference); |
| 380 | 378 |
if(yearPublished!=null){
|
| 381 |
reference.setDatePublished(TimePeriod.NewInstance(yearPublished));
|
|
| 379 |
reference.setDatePublished(VerbatimTimePeriod.NewVerbatimInstance(yearPublished));
|
|
| 382 | 380 |
} |
| 383 | 381 |
return getClassificationService().save(classification); |
| 384 | 382 |
} |
| app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListGefaesspflanzenImportNames.java | ||
|---|---|---|
| 188 | 188 |
} |
| 189 | 189 |
|
| 190 | 190 |
private void cloneTaxon(final TaxonBase<?> gesamtListeTaxon, String relationString, String sourceNameSpace, Set<TaxonBase> taxaToSave, long id, RedListGefaesspflanzenImportState state){
|
| 191 |
if(CdmUtils.isNotBlank(relationString) && !relationString.equals(".")){
|
|
| 191 |
if(isNotBlank(relationString) && !relationString.equals(".")){
|
|
| 192 | 192 |
Taxon clonedTaxon = null; |
| 193 | 193 |
|
| 194 | 194 |
if(gesamtListeTaxon.isInstanceOf(Taxon.class)){
|
Also available in: Unified diff
ref #6752 stricter use of verbatimDate in cdmlib-app