From 9c8dc025bd3130b594db5f9de411f233473bbf11 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <a.mueller@bgbm.org>
Date: Mon, 20 Aug 2018 11:52:21 +0200
Subject: [PATCH] ref #6682 split doubtful in rel doubtful and taxon doubtful +
 use full authorshipCache for MAN non-authors

---
 .../taxon/TaxonRelationshipFormatter.java     | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/taxon/TaxonRelationshipFormatter.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/taxon/TaxonRelationshipFormatter.java
index b63eed0c74..3cab85a516 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/taxon/TaxonRelationshipFormatter.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/taxon/TaxonRelationshipFormatter.java
@@ -69,23 +69,24 @@ public class TaxonRelationshipFormatter {
         if (relatedTaxon == null){
             return null;
         }
-        boolean isDoubtful = taxonRelationship.isDoubtful() || relatedTaxon.isDoubtful();
-        String doubtfulStr = isDoubtful ? "?" : "";
+
+        String doubtfulTaxonStr = relatedTaxon.isDoubtful() ? "?" : "";
+        String doubtfulRelationStr = taxonRelationship.isDoubtful() ? "?" : "";
+
 
         TaxonName name = relatedTaxon.getName();
 
-//        List<TaggedText> tags = new ArrayList<>();
         TaggedTextBuilder builder = new TaggedTextBuilder();
 
         //rel symbol
-        String symbol = getSymbol(type, reverse, languages);
+        String symbol = doubtfulRelationStr + getSymbol(type, reverse, languages);
         builder.add(TagEnum.symbol, symbol);
 
         //name
         if (isMisapplied){
             //starting quote
-            String startQuote = " " + doubtfulStr + QUOTE_START;
-            builder.addSeparator(startQuote);// .add(TaggedText.NewSeparatorInstance(startQuote));
+            String startQuote = " " + doubtfulTaxonStr + QUOTE_START;
+            builder.addSeparator(startQuote);
 
             //name cache
             List<TaggedText> nameCacheTags = getNameCacheTags(name);
@@ -95,14 +96,14 @@ public class TaxonRelationshipFormatter {
             String endQuote = QUOTE_END;
             builder.add(TagEnum.postSeparator, endQuote);
         }else{
-            builder.addSeparator(" " + doubtfulStr);
+            builder.addSeparator(" " + doubtfulTaxonStr);
             //name full title cache
             List<TaggedText> nameCacheTags = getNameTitleCacheTags(name);
             builder.addAll(nameCacheTags);
         }
 
 
-        //sensu (+ Separatoren?)
+        //sec/sensu (+ Separatoren?)
         if (isNotBlank(relatedTaxon.getAppendedPhrase())){
             builder.addWhitespace();
             builder.add(TagEnum.appendedPhrase, relatedTaxon.getAppendedPhrase());
@@ -124,10 +125,7 @@ public class TaxonRelationshipFormatter {
 
 //        //, non author
         if (isMisapplied && name != null){
-            if (name.getCombinationAuthorship() != null && isNotBlank(name.getCombinationAuthorship().getNomenclaturalTitle())){
-                builder.addSeparator(NON_SEPARATOR);
-                builder.add(TagEnum.authors, name.getCombinationAuthorship().getNomenclaturalTitle());
-            }else if (isNotBlank(name.getAuthorshipCache())){
+            if (isNotBlank(name.getAuthorshipCache())){
                 builder.addSeparator(NON_SEPARATOR);
                 builder.add(TagEnum.authors, name.getAuthorshipCache().trim());
             }
-- 
2.34.1