/ - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision 1cdff041

Added by Katja Luther almost 3 years ago

ID 1cdff0410d6ded35b2f1ccaf844badeef755c968
Parent 59fa4a9b
Child 0bc2d773

ref #9645, #9646: add namerelations to homotypicGrouString and reference to type/specimenstatement

     import eu.etaxonomy.cdm.model.occurrence.GatheringEvent;
     import eu.etaxonomy.cdm.model.occurrence.MediaSpecimen;
     import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
     import eu.etaxonomy.cdm.model.reference.NamedSource;
     import eu.etaxonomy.cdm.model.reference.OriginalSourceType;
     import eu.etaxonomy.cdm.model.reference.Reference;
     import eu.etaxonomy.cdm.model.reference.ReferenceType;
-...
                     synonymsInGroup.stream().forEach(synonym -> typifiedNames.add(HibernateProxyHelper.deproxy(synonym.getName(), TaxonName.class)));
+                }
     //            group.getTypifiedNames().stream().forEach(name -> typifiedNames.add(HibernateProxyHelper.deproxy(name, TaxonName.class)));
                 TaxonName firstname = null;
                 for (TaxonName name: typifiedNames){
                     Iterator<Taxon> taxa = name.getTaxa().iterator();
-...
                         nameString = createNameWithItalics(name.getTaggedFullTitle()) ;
+                    }
                     Set<NameRelationship> relatedNames = name.getNameRelations();
                     List<NameRelationship> nonNames = new ArrayList<>();
                     List<NameRelationship> otherRelationships = new ArrayList<>();
                     for (NameRelationship rel: relatedNames){
                         // alle Homonyme und inverse blocking names
                         if (rel.getType().equals(NameRelationshipType.LATER_HOMONYM()) || rel.getType().equals(NameRelationshipType.TREATED_AS_LATER_HOMONYM()) || (rel.getType().equals(NameRelationshipType.BLOCKING_NAME_FOR()) && rel.getToName().equals(name))){
                             nonNames.add(rel);
                         }else if (!rel.getType().isBasionymRelation()){
                             otherRelationships.add(rel);
+                        }
+                    }
                     String nonRelNames = "";
                     String relNames = "";
                     if (nonNames.size() > 0){
                         nonRelNames += " [";
+                    }
                     for (NameRelationship relName: nonNames){
                         String label = "non ";
                         TaxonName relatedName = null;
                         if (relName.getFromName().equals(name)){
                             label = relName.getType().getLabel() + " ";
                             relatedName = relName.getToName();
                         }else{
                             relatedName = relName.getFromName();
+                        }
                         nonRelNames += label + relatedName.getTitleCache() + " ";
+                    }
                     relNames.trim();
                     if (nonNames.size() > 0){
                         nonRelNames += "] ";
+                    }
                     if (otherRelationships.size() > 0){
                         relNames += " [";
+                    }
                     for (NameRelationship rel: otherRelationships){
                         String label = "";
                         TaxonName relatedName = null;
                         if (rel.getFromName().equals(name)){
                             label = rel.getType().getLabel() + " ";
                             relatedName = rel.getToName();
                         }else {
                             label = rel.getType().getInverseLabel() + " ";
                             relatedName = rel.getFromName();
+                        }
                         relNames += label + relatedName.getTitleCache() + " ";
+                    }
                     relNames.trim();
                     if (otherRelationships.size() > 0){
                         relNames += "] ";
+                    }
                     String synonymSign = "";
                     if (index > 0){
                         if (name.isInvalid()){
-...
                                  sec = "";
+                             }
                              typifiedNamesWithoutAccepted += synonymSign + doubtful + nameString ;
                              typifiedNamesWithoutAcceptedWithSec += synonymSign + doubtful + nameString + sec ;
                              typifiedNamesWithoutAccepted += synonymSign + doubtful + nameString + nonRelNames + relNames;
                              typifiedNamesWithoutAcceptedWithSec += synonymSign + doubtful + nameString + sec + nonRelNames + relNames;
                          }else{
                              sec = "";
                              if (!(((Taxon)taxonBase).isProparteSynonym() || ((Taxon)taxonBase).isMisapplication())){
-...
                             typifiedNamesWithoutAcceptedWithSec = typifiedNamesWithoutAcceptedWithSec.trim() + "; ";
+                        }
+                    }
                     typifiedNamesString += synonymSign + doubtful + nameString ;
                     typifiedNamesWithSecString += synonymSign + doubtful + nameString + sec;
                     typifiedNamesString += synonymSign + doubtful + nameString + nonRelNames + relNames;
                     typifiedNamesWithSecString += synonymSign + doubtful + nameString + sec + nonRelNames + relNames;
                     csvLine[table.getIndex(CdmLightExportTable.HOMOTYPIC_GROUP_STRING)] = typifiedNamesString.trim();
-...
                 for (TypeDesignationBase<?> typeDes: designationList) {
                 	if (typeDes instanceof TextualTypeDesignation) {
                 		typeTextDesignations = typeTextDesignations + ((TextualTypeDesignation)typeDes).getText(Language.getDefaultLanguage());
                 		typeTextDesignations =  typeTextDesignations + "; ";
                 		String typeDesStateRefs = "";
                         if (typeDes.getDesignationSource() != null ){
                             typeDesStateRefs = "[";
                             NamedSource source = typeDes.getDesignationSource();
                             if (source.getCitation() != null){
                                 typeDesStateRefs += "fide " + OriginalSourceFormatter.INSTANCE.format(source.getCitation(), null);
+                            }
                             typeDesStateRefs += "]";
                         }else if (typeDes.getSources() != null && !typeDes.getSources().isEmpty()){
                             typeDesStateRefs = "[";
                             for (IdentifiableSource source: typeDes.getSources()) {
                                 if (source.getCitation() != null){
                                     typeDesStateRefs += "fide " +OriginalSourceFormatter.INSTANCE.format(source.getCitation(), null);
+                                }
+                            }
                             typeDesStateRefs += "]";
+                        }
                 		typeTextDesignations =  typeTextDesignations + typeDesStateRefs +"; ";
+                	}
+                }
                 if (typeTextDesignations.equals("; ")) {

         protected static final String HOMOTYPIC_GROUP_WITH_SEC_STRING = "HomotypicGroupStringWithSec";
         protected static final String HOMOTYPIC_GROUP_WITHOUT_ACCEPTED = "HomotypicGroupStringWithoutAccepted";
         protected static final String HOMOTYPIC_GROUP_WITHOUT_ACCEPTEDWITHSEC = "HomotypicGroupStringWithoutAcceptedWithSec";
         protected static final String HOMOTYPIC_GROUP_TYPE_STATEMENT_REFERENCE = "HomotypicGroupTypeStatementReference";
         protected static final String TYPE_STRING = "TypeSpecimenString";
         protected static final String TYPE_CACHE = "TypeStatementsString";
         protected static final String TYPE_STRING_WITH_REF = "TypeSpecimenStringWithRef";
         protected static final String TYPE_CACHE_WITH_REF = "TypeStatementsStringWithRef";
         //NomenclaturalAuthor
         protected static final String AUTHOR_ID = "PersonOrTeam_ID";
-...
         protected static final String REF_TABLE = "ReferencedTable";
         final static String[] homotypicGroupColumns(){
             return new String[]{HOMOTYPIC_GROUP_ID, HOMOTYPIC_GROUP_STRING, TYPE_STRING, TYPE_CACHE, HOMOTYPIC_GROUP_WITH_SEC_STRING, HOMOTYPIC_GROUP_WITHOUT_ACCEPTED, HOMOTYPIC_GROUP_WITHOUT_ACCEPTEDWITHSEC, SORT_INDEX};
             return new String[]{HOMOTYPIC_GROUP_ID, HOMOTYPIC_GROUP_STRING, TYPE_STRING, TYPE_CACHE, HOMOTYPIC_GROUP_WITH_SEC_STRING, HOMOTYPIC_GROUP_WITHOUT_ACCEPTED, HOMOTYPIC_GROUP_WITHOUT_ACCEPTEDWITHSEC, SORT_INDEX, HOMOTYPIC_GROUP_TYPE_STATEMENT_REFERENCE};
+        }

Also available in: Unified diff

Project

General

Profile

EDIT

Revision 1cdff041

Added by Katja Luther almost 3 years ago

Project

General

Profile

EDIT

Revision 1cdff041

Added by Katja Luther almost 3 years ago

Related issues