Correctly set relationship direction #5448

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListGefaesspflanzenImportNames.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListGefaesspflanzenImportNames.java
index 52590ef987393d87d57666f91fb7e85f9306b2c2..a8af85f3a0b5a4f9b3c9ee51f5806dfd2ffb5823 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListGefaesspflanzenImportNames.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListGefaesspflanzenImportNames.java
@@ -179,11 +179,15 @@ public class RedListGefaesspflanzenImportNames extends DbImportBase<RedListGefae
         }
     }
 
-    private void cloneTaxon(TaxonBase taxonBase, TaxonNameBase name, TaxonRelationshipType taxonRelationshipType, Set<TaxonBase> taxaToSave, long id, String sourceNameSpace, RedListGefaesspflanzenImportState state){
+    /**
+     * <b>NOTE:</b> the {@link TaxonRelationshipType} passed as parameter is
+     * directed <b>from the clone</b> to the taxon
+     */
+    private void cloneTaxon(TaxonBase taxonBase, TaxonNameBase name, TaxonRelationshipType relationFromCloneToTaxon, Set<TaxonBase> taxaToSave, long id, String sourceNameSpace, RedListGefaesspflanzenImportState state){
             TaxonBase clone = (TaxonBase) taxonBase.clone();
             clone.setName(name);
             if(taxonBase.isInstanceOf(Taxon.class)){
-                TaxonRelationship taxonRelation = ((Taxon) taxonBase).addTaxonRelation((Taxon) clone, taxonRelationshipType, null, null);
+                TaxonRelationship taxonRelation = ((Taxon) clone).addTaxonRelation((Taxon) taxonBase, relationFromCloneToTaxon, null, null);
                 taxonRelation.setDoubtful(true);//TODO Ist das mit " mit Fragezeichen" gemeint?
             }
             ImportHelper.setOriginalSource(clone, state.getTransactionalSourceReference(), id, sourceNameSpace);

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListGefaesspflanzenTransformer.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListGefaesspflanzenTransformer.java
index 78c448d2d67651877eb9d6dd82acdb2fea3c830f..9fdb0567f83ade56f90e31ad9ffaf5e73b2426f0 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListGefaesspflanzenTransformer.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListGefaesspflanzenTransformer.java
@@ -74,7 +74,8 @@ public final class RedListGefaesspflanzenTransformer extends InputTransformerBas
         else {
             String substring = key.substring(key.length()-1, key.length());
             //        if (key.equals("<")){return TaxonRelationshipType.();}//TODO: what to do here?
-            if (substring.equals(">")){return TaxonRelationshipType.INCLUDES();}
+            if (substring.equals("=")){return TaxonRelationshipType.CONGRUENT_TO();}
+            else if (substring.equals(">")){return TaxonRelationshipType.INCLUDES();}
             else if (substring.equals("!")){return TaxonRelationshipType.OVERLAPS();}
             else if (substring.equals("?")){return TaxonRelationshipType.ALL_RELATIONSHIPS();}
             //        else if (key.equals("x")){return TaxonRelationshipType.();}//TODO: what to do here?