add IdentifierType Vocabulary

diff --git a/.gitattributes b/.gitattributes
index 49b939440a0a8f631357b62ce1beb8121e5e2b4f..c11c4644a0c2dd3d76ab42bd5bd9e9bb8d4f57ff 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1074,6 +1074,7 @@ cdmlib-model/src/main/resources/terms/ExtensionType.csv -text
 cdmlib-model/src/main/resources/terms/Feature.csv -text
 cdmlib-model/src/main/resources/terms/FormerCountries -text
 cdmlib-model/src/main/resources/terms/HybridRelationshipType.csv -text
+cdmlib-model/src/main/resources/terms/IdentifierType.csv -text
 cdmlib-model/src/main/resources/terms/InstitutionType.csv -text
 cdmlib-model/src/main/resources/terms/Language.csv -text
 cdmlib-model/src/main/resources/terms/MarkerType.csv -text

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermType.java
index 98791fc285b8a157e076fdb21b100f9382ee8c5b..90a559d93b085a1f7115596828c550bb072858d7 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermType.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermType.java
@@ -431,8 +431,10 @@ public enum TermType implements IEnumTerm<TermType>, Serializable{
     \r
     \r
     /**\r
-     * An (often global unique) Identifier Type such as DOI, LSID, Barcode, Sample Designation, ... which can be used\r
-     * as type in {@link Identifier#type} \r
+     * An Identifier Type which can be used as a type in {@link Identifier#type} . It may often be a global unique identifier such as DOI, LSID, Barcode ....\r
+     * But also local identifier types such Sample Designation, Catalog Number, \r
+     * Accession Number, ... are allowed.\r
+     * {@link Identifier#type}\r
      */\r
     @XmlEnumValue("IdentifierType")\r
     IdentifierType(UUID.fromString("d24eda99-0716-467f-aa1e-4c0f2b6c3922"), "Identifier", "IDE", null),\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/VocabularyEnum.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/VocabularyEnum.java
index 333a3e69c0dad3e2da6f4cee4bc441073ae82dd3..ddb4e5b4a3c63bc47c7204f4a787d4692bce659a 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/VocabularyEnum.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/VocabularyEnum.java
@@ -91,7 +91,8 @@ public enum VocabularyEnum {
        DnaMarkerChloroplast("e572d370-a27b-40d3-974c-cb17562b59cf", DefinedTerm.class),
        PlantKindOfUnit("5167c47b-7726-4dba-b02f-dafb7629481b", DefinedTerm.class),
        SpecimenKindOfUnit("b0344ec4-12f7-40d3-82c1-0092e9780bbd", DefinedTerm.class),
-       MediaSpecimenKindOfUnit("56f47c83-8d42-404a-88fc-03c57b560f6d", DefinedTerm.class)
+       MediaSpecimenKindOfUnit("56f47c83-8d42-404a-88fc-03c57b560f6d", DefinedTerm.class),
+       IdentifierType("67d91839-484e-4183-8b4c-6a4a80dfc066", DefinedTerm.class)
        ;
        
        

diff --git a/cdmlib-model/src/main/resources/terms/IdentifierType.csv b/cdmlib-model/src/main/resources/terms/IdentifierType.csv
new file mode 100644 (file)
index 0000000..93a99e5
--- /dev/null
+++ b/cdmlib-model/src/main/resources/terms/IdentifierType.csv
@@ -0,0 +1,7 @@
+"67d91839-484e-4183-8b4c-6a4a80dfc066",,"Identifier Type","Identifier Type","IDE","0"\r
+"fadeba12-1be3-4bc7-9ff5-361b088d86fc",,"Sample Designation","Sample Designation","SD"\r
+"a2a67523-b56c-4463-9a50-846b56f03419",,"Unknown","Unknown","UNK"\r
+"e0c3b15f-d779-4d94-91f0-7d83888576b2",,"Barcode","Barcode","BC"\r
+"ea7ef3c4-0ff5-4b1c-9264-b0f86dc00b61",,"Accession Number","Accession Number","ACN"\r
+"664eb28f-d9b6-42f1-b8fd-b3748784e0a4",,"Digital Object Identifier","DOI","DOI"\r
+"ab402e4b-93a0-4311-a85a-696c1498b67d",,"Catalog Number","Catalog Number","CAN"
\ No newline at end of file

diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml
index 80f8fcdf49028a8ac05d147c21e6d63914093335..1f0a3e1d8cc3695395e92bdf2a51248457b5116e 100644 (file)
Binary files a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml and b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml differ