Revision a6871bd2
Added by Andreas Müller over 4 years ago
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsLinkImport.java | ||
---|---|---|
29 | 29 |
import eu.etaxonomy.cdm.model.common.ExtensionType; |
30 | 30 |
import eu.etaxonomy.cdm.model.taxon.TaxonBase; |
31 | 31 |
|
32 |
|
|
33 | 32 |
/** |
34 | 33 |
* @author a.mueller |
35 | 34 |
* @since 20.02.2010 |
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsReferenceImport.java | ||
---|---|---|
54 | 54 |
|
55 | 55 |
private static final String pluralString = "sources"; |
56 | 56 |
private static final String dbTableName = "sources"; |
57 |
private static final Class cdmTargetClass = Reference.class; |
|
57 |
private static final Class<?> cdmTargetClass = Reference.class;
|
|
58 | 58 |
|
59 | 59 |
public ErmsReferenceImport(){ |
60 | 60 |
super(pluralString, dbTableName, cdmTargetClass); |
... | ... | |
105 | 105 |
|
106 | 106 |
@Override |
107 | 107 |
public Reference createObject(ResultSet rs, ErmsImportState state) throws SQLException { |
108 |
int id = rs.getInt("id"); |
|
108 |
// int id = rs.getInt("id");
|
|
109 | 109 |
String type = rs.getString("source_type"); |
110 | 110 |
Reference ref; |
111 | 111 |
if (type.equalsIgnoreCase("p")){ |
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsTaxonImport.java | ||
---|---|---|
115 | 115 |
MarkerType hasNoLastActionMarkerType = getMarkerType(DbLastActionMapper.uuidMarkerTypeHasNoLastAction, "has no last action", "No last action information available", "no last action"); |
116 | 116 |
mapping.addMapper(DbImportAnnotationMapper.NewInstance("lastAction", lastActionType, hasNoLastActionMarkerType)); |
117 | 117 |
|
118 |
// UUID hiddenUuid = ErmsTransformer.uuidHidden; |
|
119 |
// mapping.addMapper(DbImportMarkerCreationMapper.Mapper.NewInstance("qualitystatus_name", qualityUuid, "quality status", "quality status", "quality status")); //checked by Tax Editor ERMS1.1, Added by db management team (2x), checked by Tax Editor |
|
120 |
|
|
121 | 118 |
//not yet implemented |
122 | 119 |
mapping.addMapper(DbNotYetImplementedMapper.NewInstance("tu_sp", "included in rank/object creation")); |
123 | 120 |
mapping.addMapper(DbIgnoreMapper.NewInstance("cache_citation", "Needs check if this is needed in PESI")); |
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaTaxonNameImport.java | ||
---|---|---|
433 | 433 |
// Add Note extensions to this taxon |
434 | 434 |
|
435 | 435 |
if (!StringUtils.isBlank(taxComment)){ |
436 |
Extension.NewInstance(taxonBase, taxComment, getExtensionType(state, PesiTransformer.taxCommentUuid, "TaxComment", "TaxComment", "TC"));
|
|
436 |
Extension.NewInstance(taxonBase, taxComment, getExtensionType(state, PesiTransformer.uuidExtTaxComment, "TaxComment", "TaxComment", "TC"));
|
|
437 | 437 |
} |
438 | 438 |
if (!StringUtils.isBlank(fauComment)){ |
439 |
Extension.NewInstance(taxonBase, fauComment, getExtensionType(state, PesiTransformer.fauCommentUuid, "FauComment", "FauComment", "FC"));
|
|
439 |
Extension.NewInstance(taxonBase, fauComment, getExtensionType(state, PesiTransformer.uuidExtFauComment, "FauComment", "FauComment", "FC"));
|
|
440 | 440 |
} |
441 | 441 |
if (!StringUtils.isBlank(fauExtraCodes)){ |
442 |
Extension.NewInstance(taxonBase, fauExtraCodes, getExtensionType(state, PesiTransformer.fauExtraCodesUuid, "FauExtraCodes", "FauExtraCodes", "FEC"));
|
|
442 |
Extension.NewInstance(taxonBase, fauExtraCodes, getExtensionType(state, PesiTransformer.uuidExtFauExtraCodes, "FauExtraCodes", "FauExtraCodes", "FEC"));
|
|
443 | 443 |
} |
444 | 444 |
// Add UserId extensions to this zooName |
445 | 445 |
//Extension.NewInstance(zooName, expertUserId, getExtensionType(state, PesiTransformer.expertUserIdUuid, "expertUserId", "expertUserId", "EUID")); |
446 | 446 |
//Extension.NewInstance(zooName, speciesExpertUserId, getExtensionType(state, PesiTransformer.speciesExpertUserIdUuid, "speciesExpertUserId", "speciesExpertUserId", "SEUID")); |
447 | 447 |
|
448 | 448 |
// Add Expert extensions to this zooName |
449 |
Extension.NewInstance(taxonBase, expertName, getExtensionType(state, PesiTransformer.expertNameUuid, "ExpertName", "ExpertName", "EN"));
|
|
450 |
Extension.NewInstance(taxonBase, speciesExpertName, getExtensionType(state, PesiTransformer.speciesExpertNameUuid, "SpeciesExpertName", "SpeciesExpertName", "SEN"));
|
|
449 |
Extension.NewInstance(taxonBase, expertName, getExtensionType(state, PesiTransformer.uuidExtExpertName, "ExpertName", "ExpertName", "EN"));
|
|
450 |
Extension.NewInstance(taxonBase, speciesExpertName, getExtensionType(state, PesiTransformer.uuidExtSpeciesExpertName, "SpeciesExpertName", "SpeciesExpertName", "SEN"));
|
|
451 | 451 |
|
452 | 452 |
|
453 | 453 |
ImportHelper.setOriginalSource(taxonBase, fauEuConfig.getSourceReference(), taxonId, OS_NAMESPACE_TAXON); |
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiDescriptionExport.java | ||
---|---|---|
514 | 514 |
//int limit = state.getConfig().getLimitSave(); |
515 | 515 |
int limit = 2000; |
516 | 516 |
txStatus = startTransaction(true); |
517 |
ExtensionType taxCommentExtensionType = (ExtensionType)getTermService().find(PesiTransformer.taxCommentUuid);
|
|
518 |
ExtensionType fauCommentExtensionType = (ExtensionType)getTermService().find(PesiTransformer.fauCommentUuid);
|
|
519 |
ExtensionType fauExtraCodesExtensionType = (ExtensionType)getTermService().find(PesiTransformer.fauExtraCodesUuid);
|
|
517 |
ExtensionType taxCommentExtensionType = (ExtensionType)getTermService().find(PesiTransformer.uuidExtTaxComment);
|
|
518 |
ExtensionType fauCommentExtensionType = (ExtensionType)getTermService().find(PesiTransformer.uuidExtFauComment);
|
|
519 |
ExtensionType fauExtraCodesExtensionType = (ExtensionType)getTermService().find(PesiTransformer.uuidExtFauExtraCodes);
|
|
520 | 520 |
List<TaxonName> taxonNameList; |
521 | 521 |
|
522 | 522 |
int count = 0; |
... | ... | |
537 | 537 |
if (extension.getType().equals(taxCommentExtensionType)) { |
538 | 538 |
String taxComment = extension.getValue(); |
539 | 539 |
invokeNotes(taxComment, |
540 |
PesiTransformer.getNoteCategoryFk(PesiTransformer.taxCommentUuid),
|
|
541 |
PesiTransformer.getNoteCategoryCache(PesiTransformer.taxCommentUuid),
|
|
540 |
PesiTransformer.getNoteCategoryFk(PesiTransformer.uuidExtTaxComment),
|
|
541 |
PesiTransformer.getNoteCategoryCache(PesiTransformer.uuidExtTaxComment),
|
|
542 | 542 |
null, null, getTaxonKey(taxonName, state),connection); |
543 | 543 |
} else if (extension.getType().equals(fauCommentExtensionType)) { |
544 | 544 |
String fauComment = extension.getValue(); |
545 | 545 |
invokeNotes(fauComment, |
546 |
PesiTransformer.getNoteCategoryFk(PesiTransformer.fauCommentUuid),
|
|
547 |
PesiTransformer.getNoteCategoryCache(PesiTransformer.fauCommentUuid),
|
|
546 |
PesiTransformer.getNoteCategoryFk(PesiTransformer.uuidExtFauComment),
|
|
547 |
PesiTransformer.getNoteCategoryCache(PesiTransformer.uuidExtFauComment),
|
|
548 | 548 |
null, null, getTaxonKey(taxonName, state),connection); |
549 | 549 |
} else if (extension.getType().equals(fauExtraCodesExtensionType)) { |
550 | 550 |
String fauExtraCodes = extension.getValue(); |
551 | 551 |
invokeNotes(fauExtraCodes, |
552 |
PesiTransformer.getNoteCategoryFk(PesiTransformer.fauExtraCodesUuid),
|
|
553 |
PesiTransformer.getNoteCategoryCache(PesiTransformer.fauExtraCodesUuid),
|
|
552 |
PesiTransformer.getNoteCategoryFk(PesiTransformer.uuidExtFauExtraCodes),
|
|
553 |
PesiTransformer.getNoteCategoryCache(PesiTransformer.uuidExtFauExtraCodes),
|
|
554 | 554 |
null, null, getTaxonKey(taxonName, state),connection); |
555 | 555 |
} |
556 | 556 |
} |
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiExportBase.java | ||
---|---|---|
21 | 21 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
22 | 22 |
import eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer; |
23 | 23 |
import eu.etaxonomy.cdm.io.common.DbExportBase; |
24 |
import eu.etaxonomy.cdm.io.common.mapping.out.DbLastActionMapper; |
|
25 |
import eu.etaxonomy.cdm.model.common.AnnotationType; |
|
24 | 26 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
25 | 27 |
import eu.etaxonomy.cdm.model.common.Marker; |
26 | 28 |
import eu.etaxonomy.cdm.model.common.MarkerType; |
... | ... | |
515 | 517 |
return null; |
516 | 518 |
} |
517 | 519 |
|
520 |
protected List<AnnotationType> getLastActionAnnotationTypes() { |
|
521 |
Set<UUID> uuidSet = new HashSet<>(); |
|
522 |
uuidSet.add(DbLastActionMapper.uuidAnnotationTypeLastActionDate); |
|
523 |
uuidSet.add(DbLastActionMapper.uuidAnnotationTypeLastAction); |
|
524 |
@SuppressWarnings({ "unchecked", "rawtypes" }) |
|
525 |
List<AnnotationType> result = (List)getTermService().find(uuidSet); |
|
526 |
return result; |
|
527 |
} |
|
528 |
|
|
518 | 529 |
} |
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiExportConfigurator.java | ||
---|---|---|
63 | 63 |
PesiAdditionalSourceExport.class, |
64 | 64 |
PesiDescriptionExport.class, |
65 | 65 |
PesiFinalUpdateExport.class |
66 |
|
|
67 |
// PesiNoteExport.class, |
|
68 |
// PesiNoteSourceExport.class, // NoteId's could be deleted from state hashmap |
|
69 |
// PesiAdditionalTaxonSourceExport_OLD.class, |
|
70 |
// PesiOccurrenceExport.class, |
|
71 |
// PesiOccurrenceSourceExport.class, |
|
72 |
// PesiImageExport.class, |
|
73 | 66 |
}; |
74 | 67 |
} |
75 | 68 |
|
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiRelTaxonExport.java | ||
---|---|---|
11 | 11 |
import java.sql.Connection; |
12 | 12 |
import java.sql.PreparedStatement; |
13 | 13 |
import java.util.ArrayList; |
14 |
import java.util.HashSet; |
|
15 | 14 |
import java.util.List; |
16 |
import java.util.Set; |
|
17 |
import java.util.UUID; |
|
18 | 15 |
|
19 | 16 |
import org.apache.log4j.Logger; |
20 | 17 |
import org.springframework.stereotype.Component; |
... | ... | |
22 | 19 |
|
23 | 20 |
import eu.etaxonomy.cdm.io.common.Source; |
24 | 21 |
import eu.etaxonomy.cdm.io.common.mapping.out.DbAnnotationMapper; |
25 |
import eu.etaxonomy.cdm.io.common.mapping.out.DbLastActionMapper; |
|
26 | 22 |
import eu.etaxonomy.cdm.io.common.mapping.out.DbObjectMapper; |
27 | 23 |
import eu.etaxonomy.cdm.io.common.mapping.out.MethodMapper; |
28 |
import eu.etaxonomy.cdm.model.common.AnnotationType; |
|
29 | 24 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
30 | 25 |
import eu.etaxonomy.cdm.model.common.IdentifiableEntity; |
31 | 26 |
import eu.etaxonomy.cdm.model.common.RelationshipBase; |
... | ... | |
460 | 455 |
return mapping; |
461 | 456 |
} |
462 | 457 |
|
463 |
private List<AnnotationType> getLastActionAnnotationTypes() { |
|
464 |
Set<UUID> uuidSet = new HashSet<>(); |
|
465 |
uuidSet.add(DbLastActionMapper.uuidAnnotationTypeLastActionDate); |
|
466 |
uuidSet.add(DbLastActionMapper.uuidAnnotationTypeLastAction); |
|
467 |
@SuppressWarnings({ "unchecked", "rawtypes" }) |
|
468 |
List<AnnotationType> result = (List)getTermService().find(uuidSet); |
|
469 |
return result; |
|
470 |
} |
|
471 | 458 |
|
472 | 459 |
@Override |
473 | 460 |
protected boolean doCheck(PesiExportState state) { |
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiSourceExport.java | ||
---|---|---|
212 | 212 |
private static Integer getSourceCategoryFK(Reference reference) { |
213 | 213 |
Integer result = null; |
214 | 214 |
try { |
215 |
result = PesiTransformer.reference2SourceCategoryFK(reference); |
|
215 |
result = PesiTransformer.reference2SourceCategoryFK(reference);
|
|
216 | 216 |
} catch (Exception e) { |
217 | 217 |
e.printStackTrace(); |
218 | 218 |
} |
... | ... | |
430 | 430 |
|
431 | 431 |
mapping.addMapper(MethodMapper.NewInstance("NomRefCache", this)); |
432 | 432 |
mapping.addMapper(DbExtensionMapper.NewInstance(ExtensionType.URL(), "Link")); |
433 |
mapping.addMapper(DbAnnotationMapper.NewInstance(null, "Notes")); |
|
433 |
mapping.addMapper(DbAnnotationMapper.NewInstance((String)null, "Notes"));
|
|
434 | 434 |
mapping.addMapper(MethodMapper.NewInstance("RefIdInSource", this)); |
435 | 435 |
mapping.addMapper(MethodMapper.NewInstance("OriginalDB", this)); |
436 | 436 |
|
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTaxonExport.java | ||
---|---|---|
171 | 171 |
|
172 | 172 |
// Find extensionTypes |
173 | 173 |
lastActionExtensionType = (ExtensionType)getTermService().find(PesiTransformer.lastActionUuid); |
174 |
lastActionDateExtensionType = (ExtensionType)getTermService().find(PesiTransformer.lastActionDateUuid);
|
|
175 |
expertNameExtensionType = (ExtensionType)getTermService().find(PesiTransformer.expertNameUuid);
|
|
176 |
speciesExpertNameExtensionType = (ExtensionType)getTermService().find(PesiTransformer.speciesExpertNameUuid);
|
|
177 |
cacheCitationExtensionType = (ExtensionType)getTermService().find(PesiTransformer.cacheCitationUuid);
|
|
174 |
lastActionDateExtensionType = (ExtensionType)getTermService().find(PesiTransformer.uuidExtLastActionDate);
|
|
175 |
expertNameExtensionType = (ExtensionType)getTermService().find(PesiTransformer.uuidExtExpertName);
|
|
176 |
speciesExpertNameExtensionType = (ExtensionType)getTermService().find(PesiTransformer.uuidExtSpeciesExpertName);
|
|
177 |
cacheCitationExtensionType = (ExtensionType)getTermService().find(PesiTransformer.uuidExtCacheCitation);
|
|
178 | 178 |
|
179 | 179 |
//Export Taxa.. |
180 | 180 |
success &= doPhase01(state, mapping, additionalSourceMapping); |
... | ... | |
2548 | 2548 |
mapping.addMapper(DbLastActionMapper.NewInstance("LastAction", true)); |
2549 | 2549 |
|
2550 | 2550 |
//experts |
2551 |
ExtensionType extensionTypeSpeciesExpertName = (ExtensionType)getTermService().find(PesiTransformer.speciesExpertNameUuid);
|
|
2551 |
ExtensionType extensionTypeSpeciesExpertName = (ExtensionType)getTermService().find(PesiTransformer.uuidExtSpeciesExpertName);
|
|
2552 | 2552 |
mapping.addMapper(DbExtensionMapper.NewInstance(extensionTypeSpeciesExpertName, "SpeciesExpertName")); |
2553 |
ExtensionType extensionTypeExpertName = (ExtensionType)getTermService().find(PesiTransformer.expertNameUuid);
|
|
2553 |
ExtensionType extensionTypeExpertName = (ExtensionType)getTermService().find(PesiTransformer.uuidExtExpertName);
|
|
2554 | 2554 |
mapping.addMapper(DbExtensionMapper.NewInstance(extensionTypeExpertName, "ExpertName")); |
2555 | 2555 |
|
2556 | 2556 |
// mapping.addMapper(MethodMapper.NewInstance("ParentTaxonFk", this, TaxonBase.class, PesiExportState.class)); //by AM, doesn't work, FK exception |
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTransformer.java | ||
---|---|---|
92 | 92 |
|
93 | 93 |
|
94 | 94 |
//extension type uuids |
95 |
public static final UUID cacheCitationUuid = UUID.fromString("29656168-32d6-4301-9067-d57c63be5c67");
|
|
95 |
public static final UUID uuidExtCacheCitation = UUID.fromString("29656168-32d6-4301-9067-d57c63be5c67");
|
|
96 | 96 |
//public static final UUID expertUserIdUuid = UUID.fromString("e25813d3-c67c-4585-9aa0-970fafde50b4"); |
97 | 97 |
//public static final UUID speciesExpertUserIdUuid = UUID.fromString("6d42abd8-8894-4980-ae07-e918affd4172"); |
98 |
public static final UUID expertNameUuid = BerlinModelTransformer.uuidExpertName;
|
|
99 |
public static final UUID speciesExpertNameUuid = BerlinModelTransformer.uuidSpeciesExpertName;
|
|
100 |
public static final UUID lastActionDateUuid = UUID.fromString("8d0a7d81-bb83-4576-84c3-8c906ef039b2");
|
|
101 |
public static final UUID lastActionUuid = UUID.fromString("bc20d5bc-6161-4279-9499-89ea26ce5f6a");
|
|
102 |
public static final UUID taxCommentUuid = UUID.fromString("8041a752-0479-4626-ab1b-b266b751f816");
|
|
103 |
public static final UUID fauCommentUuid = UUID.fromString("054f773a-41c8-4ad5-83e3-981320c1c126");
|
|
104 |
public static final UUID fauExtraCodesUuid = UUID.fromString("b8c7e77d-9869-4787-bed6-b4b302dbc5f5");
|
|
98 |
public static final UUID uuidExtExpertName = BerlinModelTransformer.uuidExpertName;
|
|
99 |
public static final UUID uuidExtSpeciesExpertName = BerlinModelTransformer.uuidSpeciesExpertName;
|
|
100 |
public static final UUID uuidExtLastActionDate = UUID.fromString("8d0a7d81-bb83-4576-84c3-8c906ef039b2");
|
|
101 |
public static final UUID uuidExtLastAction = UUID.fromString("bc20d5bc-6161-4279-9499-89ea26ce5f6a");
|
|
102 |
public static final UUID uuidExtTaxComment = UUID.fromString("8041a752-0479-4626-ab1b-b266b751f816");
|
|
103 |
public static final UUID uuidExtFauComment = UUID.fromString("054f773a-41c8-4ad5-83e3-981320c1c126");
|
|
104 |
public static final UUID uuidExtFauExtraCodes = UUID.fromString("b8c7e77d-9869-4787-bed6-b4b302dbc5f5");
|
|
105 | 105 |
|
106 | 106 |
// References |
107 | 107 |
public static int REF_ARTICLE_IN_PERIODICAL = 1; |
... | ... | |
2381 | 2381 |
*/ |
2382 | 2382 |
public static Integer getNoteCategoryFk(UUID uuid) { |
2383 | 2383 |
Integer result = null; |
2384 |
if (uuid.equals(taxCommentUuid)) {
|
|
2384 |
if (uuid.equals(uuidExtTaxComment)) {
|
|
2385 | 2385 |
result = 270; |
2386 |
} else if (uuid.equals(fauCommentUuid)) {
|
|
2386 |
} else if (uuid.equals(uuidExtFauComment)) {
|
|
2387 | 2387 |
result = 281; |
2388 |
} else if (uuid.equals(fauExtraCodesUuid)) {
|
|
2388 |
} else if (uuid.equals(uuidExtFauExtraCodes)) {
|
|
2389 | 2389 |
result = 278; |
2390 | 2390 |
} |
2391 | 2391 |
return result; |
... | ... | |
2398 | 2398 |
*/ |
2399 | 2399 |
public static String getNoteCategoryCache(UUID uuid) { |
2400 | 2400 |
String result = null; |
2401 |
if (uuid.equals(taxCommentUuid)) {
|
|
2401 |
if (uuid.equals(uuidExtTaxComment)) {
|
|
2402 | 2402 |
result = "Taxonomy"; |
2403 |
} else if (uuid.equals(fauCommentUuid)) {
|
|
2403 |
} else if (uuid.equals(uuidExtFauComment)) {
|
|
2404 | 2404 |
result = "Biology"; |
2405 |
} else if (uuid.equals(fauExtraCodesUuid)) {
|
|
2405 |
} else if (uuid.equals(uuidExtFauExtraCodes)) {
|
|
2406 | 2406 |
result = "Distribution"; |
2407 | 2407 |
} |
2408 | 2408 |
return result; |
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/old/PesiNoteExport.java | ||
---|---|---|
180 | 180 |
private void doPhase02(PesiExportState state, int limit) { |
181 | 181 |
TransactionStatus txStatus; |
182 | 182 |
txStatus = startTransaction(true); |
183 |
ExtensionType taxCommentExtensionType = (ExtensionType)getTermService().find(PesiTransformer.taxCommentUuid);
|
|
184 |
ExtensionType fauCommentExtensionType = (ExtensionType)getTermService().find(PesiTransformer.fauCommentUuid);
|
|
185 |
ExtensionType fauExtraCodesExtensionType = (ExtensionType)getTermService().find(PesiTransformer.fauExtraCodesUuid);
|
|
183 |
ExtensionType taxCommentExtensionType = (ExtensionType)getTermService().find(PesiTransformer.uuidExtTaxComment);
|
|
184 |
ExtensionType fauCommentExtensionType = (ExtensionType)getTermService().find(PesiTransformer.uuidExtFauComment);
|
|
185 |
ExtensionType fauExtraCodesExtensionType = (ExtensionType)getTermService().find(PesiTransformer.uuidExtFauExtraCodes);
|
|
186 | 186 |
List<TaxonBase> taxonBaseList = null; |
187 | 187 |
|
188 | 188 |
int count = 0; |
... | ... | |
199 | 199 |
if (extension.getType().equals(taxCommentExtensionType)) { |
200 | 200 |
String taxComment = extension.getValue(); |
201 | 201 |
invokeNotes(taxComment, |
202 |
PesiTransformer.getNoteCategoryFk(PesiTransformer.taxCommentUuid),
|
|
203 |
PesiTransformer.getNoteCategoryCache(PesiTransformer.taxCommentUuid),
|
|
202 |
PesiTransformer.getNoteCategoryFk(PesiTransformer.uuidExtTaxComment),
|
|
203 |
PesiTransformer.getNoteCategoryCache(PesiTransformer.uuidExtTaxComment),
|
|
204 | 204 |
null, null, getTaxonFk(taxon.getName(), state),connection); |
205 | 205 |
} else if (extension.getType().equals(fauCommentExtensionType)) { |
206 | 206 |
String fauComment = extension.getValue(); |
207 | 207 |
invokeNotes(fauComment, |
208 |
PesiTransformer.getNoteCategoryFk(PesiTransformer.fauCommentUuid),
|
|
209 |
PesiTransformer.getNoteCategoryCache(PesiTransformer.fauCommentUuid),
|
|
208 |
PesiTransformer.getNoteCategoryFk(PesiTransformer.uuidExtFauComment),
|
|
209 |
PesiTransformer.getNoteCategoryCache(PesiTransformer.uuidExtFauComment),
|
|
210 | 210 |
null, null, getTaxonFk(taxon.getName(), state),connection); |
211 | 211 |
} else if (extension.getType().equals(fauExtraCodesExtensionType)) { |
212 | 212 |
String fauExtraCodes = extension.getValue(); |
213 | 213 |
invokeNotes(fauExtraCodes, |
214 |
PesiTransformer.getNoteCategoryFk(PesiTransformer.fauExtraCodesUuid),
|
|
215 |
PesiTransformer.getNoteCategoryCache(PesiTransformer.fauExtraCodesUuid),
|
|
214 |
PesiTransformer.getNoteCategoryFk(PesiTransformer.uuidExtFauExtraCodes),
|
|
215 |
PesiTransformer.getNoteCategoryCache(PesiTransformer.uuidExtFauExtraCodes),
|
|
216 | 216 |
null, null, getTaxonFk(taxon.getName(), state),connection); |
217 | 217 |
} |
218 | 218 |
} |
Also available in: Unified diff
cleanup