fix #7514 update symbols for MAN and ppSynonyms

diff --git a/cdmlib-model/src/main/resources/terms/TaxonRelationshipType.csv b/cdmlib-model/src/main/resources/terms/TaxonRelationshipType.csv
index 45ca71a786fafbde20b0add56b0f38647a8b3a90..e3b94b3f75052adc09c1541d68f2219da87fc0fb 100644 (file)
--- a/cdmlib-model/src/main/resources/terms/TaxonRelationshipType.csv
+++ b/cdmlib-model/src/main/resources/terms/TaxonRelationshipType.csv
@@ -1,11 +1,11 @@
 "15db0cf7-7afc-4a86-a7d4-221c73b0c9ac",,"Taxon Relationship Type","Taxon Relationship Type","TRT","1"
 "d13fecdf-eb44-4dd7-9244-26679c05df1c",,"Taxonomically Included in","Taxonomically Included in","⊂","Taxonomically Includes","Taxonomically Includes","⊃",FALSE,TRUE
-"1ed87175-59dd-437e-959e-0d71583d8417",,"Misapplied Name for","Misapplied Name for","–","Has Misapplied Name","Has Misapplied Name","–",FALSE,FALSE
-"b59b4bd2-11ff-45d1-bae2-146efdeee206",,"Pro parte Misapplied Name for","Pro parte Misapplied Name for","p.p.MAN","Has pro parte misapplied name","Has pro parte misapplied name",,FALSE,FALSE
-"859fb615-b0e8-440b-866e-8a19f493cd36",,"Partial Misapplied Name for","Partial Misapplied Name for","partial MAN","Has partial misapplied name","Has partial misapplied name",,FALSE,FALSE
+"1ed87175-59dd-437e-959e-0d71583d8417",,"Misapplied Name for","Misapplied Name for","––","Has Misapplied Name","Has Misapplied Name","–",FALSE,FALSE
+"b59b4bd2-11ff-45d1-bae2-146efdeee206",,"Pro parte Misapplied Name for","Pro parte Misapplied Name for","––(p.p.)","Has pro parte misapplied name","Has pro parte misapplied name","-(p.p.)",FALSE,FALSE
+"859fb615-b0e8-440b-866e-8a19f493cd36",,"Partial Misapplied Name for","Partial Misapplied Name for","––(part.)","Has partial misapplied name","Has partial misapplied name","-(part.)",FALSE,FALSE
 "605b1d01-f2b1-4544-b2e0-6f08def3d6ed",,"Invalid Designation for","Invalid Designation for","–","Has Invalid Designation","Has Invalid Designation",,FALSE,FALSE
-"8a896603-0fa3-44c6-9cd7-df2d8792e577",,"Pro parte synonym for","Pro parte synonym for","p.p.","Has pro parte synonym","Has pro parte synonym","⊃p.p.",FALSE,FALSE
-"9d7a5e56-973c-474c-b6c3-a1cb00833a3c",,"Partial synonym for","Partial synonym for","partim","Has partial synonym","Has partial synonym","⊃partim",FALSE,FALSE
+"8a896603-0fa3-44c6-9cd7-df2d8792e577",,"Pro parte synonym for","Pro parte synonym for","⊃p.p.","Has pro parte synonym","Has pro parte synonym","p.p.",FALSE,FALSE
+"9d7a5e56-973c-474c-b6c3-a1cb00833a3c",,"Partial synonym for","Partial synonym for","⊃part.","Has partial synonym","Has partial synonym","part.",FALSE,FALSE
 "a8f03491-2ad6-4fae-a04c-2a4c117a2e9b",,"Contradiction","Contradiction","∅","Contradiction","Contradiction","∅",TRUE,FALSE
 "60974c98-64ab-4574-bb5c-c110f6db634d",,"Congruent to","Congruent to","≜","Congruent to","Congruent to","≜",TRUE,FALSE
 "0501c385-cab1-4fbe-b945-fc747419bb13",,"Includes","Includes","⊃","Included in","Included in","⊂",FALSE,TRUE

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v50_51/SchemaUpdater_50_55.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v50_51/SchemaUpdater_50_55.java
index 54578222261acf8591954abbf69a800dcf5d2787..3ef772b9ce7023dabfc90db60f7fcb268f1db21f 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v50_51/SchemaUpdater_50_55.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v50_51/SchemaUpdater_50_55.java
@@ -114,13 +114,65 @@ public class SchemaUpdater_50_55 extends SchemaUpdaterBase {
         step = ColumnTypeChanger.NewStringSizeInstance(stepName, tableName, columnName, 36, !INCLUDE_AUDIT);
         stepList.add(step);
 
+        //7514 change symbols for pro parte synonyms and misapplied name relationship types
+        updateConceptRelationshipSymbols(stepList);
 
         return stepList;
 
        }
 
 
-       //7857 update name realtionships
+       //7514
+    private void updateConceptRelationshipSymbols(List<ISchemaUpdaterStep> stepList) {
+
+        //Update misapplied name symbols
+        String stepName = "Update misapplied name symbols";
+        String query = "UPDATE @@DefinedTermBase@@ "
+                + " SET symbol='––' , inverseSymbol = '-' "
+                + " WHERE uuid = '1ed87175-59dd-437e-959e-0d71583d8417' ";
+        String tableName = "DefinedTermBase";
+        ISchemaUpdaterStep step = SimpleSchemaUpdaterStep.NewAuditedInstance(stepName, query, tableName, -99);
+        stepList.add(step);
+
+        //Update pro parte misapplied name symbols
+        stepName = "Update pro parte misapplied name symbols";
+        query = "UPDATE @@DefinedTermBase@@ "
+                + " SET symbol='––(p.p.)' , inverseSymbol = '-(p.p.)' "
+                + " WHERE uuid = 'b59b4bd2-11ff-45d1-bae2-146efdeee206' ";
+        tableName = "DefinedTermBase";
+        step = SimpleSchemaUpdaterStep.NewAuditedInstance(stepName, query, tableName, -99);
+        stepList.add(step);
+
+        //Update partial misapplied name symbols
+        stepName = "Update partial misapplied name symbols";
+        query = "UPDATE @@DefinedTermBase@@ "
+                + " SET symbol='––(part.)' , inverseSymbol = '-(part.)' "
+                + " WHERE uuid = '859fb615-b0e8-440b-866e-8a19f493cd36' ";
+        tableName = "DefinedTermBase";
+        step = SimpleSchemaUpdaterStep.NewAuditedInstance(stepName, query, tableName, -99);
+        stepList.add(step);
+
+        //Update pro parte synonym symbols
+        stepName = "Update pro parte synonym symbols";
+        query = "UPDATE @@DefinedTermBase@@ "
+                + " SET symbol='⊃p.p.' , inverseSymbol = 'p.p.' "
+                + " WHERE uuid = '8a896603-0fa3-44c6-9cd7-df2d8792e577' ";
+        tableName = "DefinedTermBase";
+        step = SimpleSchemaUpdaterStep.NewAuditedInstance(stepName, query, tableName, -99);
+        stepList.add(step);
+
+        //Update partial synonym symbols
+        stepName = "Update partial synonym symbols";
+        query = "UPDATE @@DefinedTermBase@@ "
+                + " SET symbol='⊃part.' , inverseSymbol = 'part.' "
+                + " WHERE uuid = '9d7a5e56-973c-474c-b6c3-a1cb00833a3c' ";
+        tableName = "DefinedTermBase";
+        step = SimpleSchemaUpdaterStep.NewAuditedInstance(stepName, query, tableName, -99);
+        stepList.add(step);
+
+    }
+
+    //7857 update name realtionships
     private void updateNameRelationships(List<ISchemaUpdaterStep> stepList) {
 
         //7857 Update symmetrical for name relationships