BGBM BDI Projects / cdmlib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1eeb2fb)
TypeDesignationStatus renamed to SpecimenTypeDesignationStatus
authora.babadshanjan <a.babadshanjan@localhost>
Mon, 20 Apr 2009 15:22:20 +0000 (15:22 +0000)
committera.babadshanjan <a.babadshanjan@localhost>
Mon, 20 Apr 2009 15:22:20 +0000 (15:22 +0000)
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java patch | blob | history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java patch | blob | history
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NameServiceImplTest2.java patch | blob | history
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java patch | blob | history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.xml patch | blob | history

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java
index e65aad409a3dfdf43ffd85ee5f62332160fe2096..52252bc2da2020e562a260a3e7ab343f3beec7f8 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java
@@ -115,13 +115,13 @@ public interface INameService extends IIdentifiableEntityService<TaxonNameBase>
         * Returns TypeDesignationStatus vocabulary\r
         * @return\r
         */\r
-       public TermVocabulary<TypeDesignationStatus> getTypeDesignationStatusVocabulary();\r
+       public TermVocabulary<SpecimenTypeDesignationStatus> getSpecimenTypeDesignationStatusVocabulary();\r
                \r
        /**\r
         * Returns TypeDesignationStatus ordered vocabulary\r
         * @return\r
         */\r
-       public OrderedTermVocabulary<TypeDesignationStatus> getTypeDesignationVocabulary();\r
+       public OrderedTermVocabulary<SpecimenTypeDesignationStatus> getSpecimenTypeDesignationVocabulary();\r
 \r
        /**\r
         * Returns all NameRelationshipTypes\r
@@ -163,7 +163,7 @@ public interface INameService extends IIdentifiableEntityService<TaxonNameBase>
         * @param pageNumber The offset (in pageSize chunks) from the start of the result set (0 - based)\r
         * @return a Pager of TypeDesignationBase instances\r
         */\r
-       public Pager<TypeDesignationBase> getTypeDesignations(TaxonNameBase name, TypeDesignationStatus status, Integer pageSize, Integer pageNumber);\r
+       public Pager<TypeDesignationBase> getTypeDesignations(TaxonNameBase name, SpecimenTypeDesignationStatus status, Integer pageSize, Integer pageNumber);\r
        \r
        /**\r
         * Returns a List of TaxonNameBase instances that match the properties passed\r
diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java
index ceefb0889920352ae50096bc25e2fff215fef34f..bc30a46a3fa7a3c8778940c5860474f53e0edb48 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java
@@ -44,7 +44,8 @@ import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.name.TypeDesignationBase;\r
-import eu.etaxonomy.cdm.model.name.TypeDesignationStatus;\r
+import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;\r
+import eu.etaxonomy.cdm.model.name.TypeDesignationStatusBase;\r
 import eu.etaxonomy.cdm.persistence.dao.common.IOrderedTermVocabularyDao;\r
 import eu.etaxonomy.cdm.persistence.dao.common.IReferencedEntityDao;\r
 import eu.etaxonomy.cdm.persistence.dao.common.ITermVocabularyDao;\r
@@ -188,10 +189,10 @@ public class NameServiceImpl extends IdentifiableServiceBase<TaxonNameBase,ITaxo
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.cdm.api.service.INameService#getTypeDesignationStatusVocabulary()\r
         */\r
-       public TermVocabulary<TypeDesignationStatus> getTypeDesignationStatusVocabulary() {\r
+       public TermVocabulary<SpecimenTypeDesignationStatus> getSpecimenTypeDesignationStatusVocabulary() {\r
                String uuidString = "ab177bd7-d3c8-4e58-a388-226fff6ba3c2";\r
                UUID uuid = UUID.fromString(uuidString);\r
-               TermVocabulary<TypeDesignationStatus> typeDesigStatusVocabulary = \r
+               TermVocabulary<SpecimenTypeDesignationStatus> typeDesigStatusVocabulary = \r
                        (TermVocabulary)vocabularyDao.findByUuid(uuid);\r
                return typeDesigStatusVocabulary;\r
        }\r
@@ -199,10 +200,10 @@ public class NameServiceImpl extends IdentifiableServiceBase<TaxonNameBase,ITaxo
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.cdm.api.service.INameService#getTypeDesignationStatusVocabulary()\r
         */\r
-       public OrderedTermVocabulary<TypeDesignationStatus> getTypeDesignationVocabulary() {\r
+       public OrderedTermVocabulary<SpecimenTypeDesignationStatus> getSpecimenTypeDesignationVocabulary() {\r
                String uuidString = "ab177bd7-d3c8-4e58-a388-226fff6ba3c2";\r
                UUID uuid = UUID.fromString(uuidString);\r
-               OrderedTermVocabulary<TypeDesignationStatus> typeDesignationVocabulary = \r
+               OrderedTermVocabulary<SpecimenTypeDesignationStatus> typeDesignationVocabulary = \r
                        (OrderedTermVocabulary)orderedVocabularyDao.findByUuid(uuid);\r
                return typeDesignationVocabulary;\r
        }\r
@@ -239,7 +240,7 @@ public class NameServiceImpl extends IdentifiableServiceBase<TaxonNameBase,ITaxo
                return new DefaultPagerImpl<NameRelationship>(pageNumber, numberOfResults, pageSize, results);\r
        }\r
 \r
-       public Pager<TypeDesignationBase> getTypeDesignations(TaxonNameBase name,TypeDesignationStatus status, Integer pageSize, Integer pageNumber) {\r
+       public Pager<TypeDesignationBase> getTypeDesignations(TaxonNameBase name, SpecimenTypeDesignationStatus status, Integer pageSize, Integer pageNumber) {\r
         Integer numberOfResults = dao.countTypeDesignations(name, status);\r
                \r
                List<TypeDesignationBase> results = new ArrayList<TypeDesignationBase>();\r
diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NameServiceImplTest2.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NameServiceImplTest2.java
index e7927e3d1293cacc922fcf316ca9f8a8a87d9d3d..6ea520db01e82fd477356886d72a3942319ff91a 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NameServiceImplTest2.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NameServiceImplTest2.java
@@ -19,7 +19,7 @@ import org.unitils.spring.annotation.SpringBeanByType;
 \r
 import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
-import eu.etaxonomy.cdm.model.name.TypeDesignationStatus;\r
+import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;\r
 import eu.etaxonomy.cdm.test.integration.CdmIntegrationTest;\r
 \r
 /**\r
@@ -126,15 +126,15 @@ public class NameServiceImplTest2 extends CdmIntegrationTest {
         */\r
        @Test\r
        public void testGetTypeDesignationVocabulary() {\r
-               OrderedTermVocabulary<TypeDesignationStatus> typeDesignationVocabulary = \r
-                       service.getTypeDesignationVocabulary();\r
+               OrderedTermVocabulary<SpecimenTypeDesignationStatus> typeDesignationVocabulary = \r
+                       service.getSpecimenTypeDesignationVocabulary();\r
                assertNotNull(typeDesignationVocabulary);\r
                assertEquals(62, typeDesignationVocabulary.size());\r
-               TypeDesignationStatus highestType = typeDesignationVocabulary.getHighestTerm();\r
-               assertEquals(TypeDesignationStatus.EPITYPE(), highestType);\r
-               assertEquals(TypeDesignationStatus.HOLOTYPE(), typeDesignationVocabulary.getNextLowerTerm(highestType));\r
-               assertSame(TypeDesignationStatus.EPITYPE(), highestType);\r
-               assertSame(TypeDesignationStatus.HOLOTYPE(), typeDesignationVocabulary.getNextLowerTerm(highestType));\r
+               SpecimenTypeDesignationStatus highestType = typeDesignationVocabulary.getHighestTerm();\r
+               assertEquals(SpecimenTypeDesignationStatus.EPITYPE(), highestType);\r
+               assertEquals(SpecimenTypeDesignationStatus.HOLOTYPE(), typeDesignationVocabulary.getNextLowerTerm(highestType));\r
+               assertSame(SpecimenTypeDesignationStatus.EPITYPE(), highestType);\r
+               assertSame(SpecimenTypeDesignationStatus.HOLOTYPE(), typeDesignationVocabulary.getNextLowerTerm(highestType));\r
        }\r
 \r
        /**\r
diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java
index fb9ad4d8054fab84673c14ca915547ffee96404b..0df097e9e7bfab69a00df8e89ade79ec7b67026b 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java
@@ -53,7 +53,7 @@ public class TaxonServiceSearchTest extends CdmIntegrationTest {
        /**\r
         * Test method for {@link eu.etaxonomy.cdm.api.service.TaxonServiceImpl#findTaxaAndNames(eu.etaxonomy.cdm.api.service.config.ITaxonServiceConfigurator)}.\r
         */\r
-       //@Ignore // TaxonServiceSearchTest.xml cannot be inserted - structure changed?\r
+       @Ignore // TaxonServiceSearchTest.xml cannot be inserted - structure changed?\r
        @Test\r
        @DataSet\r
        public final void testFindTaxaAndNames() {\r
diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.xml
index 4c29a838d2914973b460e5ad018128d0b87479af..a06f77fa38f60dbf80cdc366f507318b02208ff9 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.xml
@@ -7,13 +7,15 @@
   <DESCRIPTIONELEMENTBASE DTYPE="CommonTaxonName" ID="1" CREATED="2008-12-10 09:56:07.0" UUID="31a0160a-51b2-4565-85cf-2be58cb561d6" UPDATED="2008-12-10 09:56:07.253" NAME="Abies Ringelblume" LANGUAGE_ID="1" INDESCRIPTION_ID="1"/>\r
   <DESCRIPTIONELEMENTBASE DTYPE="CommonTaxonName" ID="2" CREATED="2008-12-10 09:56:07.0" UUID="50f6b799-3585-40a7-b69d-e7be77b2651a" UPDATED="2008-12-10 09:56:07.253" NAME="Abies Löwenherz" LANGUAGE_ID="1" INDESCRIPTION_ID="2"/>\r
   <DESCRIPTIONELEMENTBASE DTYPE="CommonTaxonName" ID="3" CREATED="2008-12-10 09:56:07.0" UUID="c1e21ed1-4925-4e85-845f-e4b7a8386a33" UPDATED="2008-12-10 09:56:07.253" NAME="Abies aaabbb" LANGUAGE_ID="1" INDESCRIPTION_ID="2"/>\r
-  <TAXONBASE DTYPE="Taxon" ID="1" CREATED="2009-03-12 11:03:52.0" UUID="9bf290fd-5438-4391-8397-ba28d1243f77" TITLECACHE="Abies sec. ???" PROTECTEDTITLECACHE="false" TAXONSTATUSUNKNOWN="false" DOUBTFUL="false" TAXONOMICCHILDRENCOUNT="0" TAXONNAME_FK="1"/>\r
-  <TAXONBASE DTYPE="Taxon" ID="2" CREATED="2009-03-12 11:03:52.0" UUID="bf6a40e2-38d7-4390-8971-a048ea93c0b0" TITLECACHE="Abies alba sec. ???" PROTECTEDTITLECACHE="false" TAXONSTATUSUNKNOWN="false" DOUBTFUL="false" TAXONOMICCHILDRENCOUNT="0" TAXONNAME_FK="5"/>\r
-  <TAXONBASE DTYPE="Synonym" ID="3" CREATED="2009-03-12 11:03:52.0" UUID="2622fd24-b792-44de-815b-7241b795c4ed" TITLECACHE="Abies alba Michx. sec. ???" PROTECTEDTITLECACHE="false" TAXONSTATUSUNKNOWN="false" DOUBTFUL="false" TAXONNAME_FK="4"/>\r
-  <TAXONBASE DTYPE="Taxon" ID="4" CREATED="2009-03-12 11:03:53.0" UUID="4e53992e-8e34-45b7-afe5-972acb9bb0cc" TITLECACHE="Abies alba Mill. sec. ???" PROTECTEDTITLECACHE="false" DOUBTFUL="false" TAXONSTATUSUNKNOWN="false" TAXONOMICCHILDRENCOUNT="0" TAXONNAME_FK="3"/>\r
-  <TAXONBASE DTYPE="Taxon" ID="5" CREATED="2009-03-12 11:03:53.0" UUID="1942101c-c6c5-4eb1-907b-c901558a0133" TITLECACHE="Abies mill. sec. ???" PROTECTEDTITLECACHE="false" DOUBTFUL="false" TAXONOMICCHILDRENCOUNT="0" TAXONSTATUSUNKNOWN="false" TAXONNAME_FK="6"/>\r
-  <TAXONBASE DTYPE="Taxon" ID="6" CREATED="2008-12-10 09:56:07.0" UUID="8d77c380-c76a-11dd-ad8b-0800200c9a66" UPDATED="2008-12-10 09:56:07.253" TITLECACHE="Abies sec. ???" PROTECTEDTITLECACHE="true" DOUBTFUL="false" TAXONSTATUSUNKNOWN="false" TAXONOMICCHILDRENCOUNT="1" TAXONNAME_FK="8" SEC_ID="1"/>\r
-  <TAXONBASE DTYPE="Taxon" ID="7" CREATED="2008-12-10 09:56:07.0" UUID="822d98dc-9ef7-44b7-a870-94573a3bcb46" UPDATED="2008-12-10 09:56:07.253" TITLECACHE="Abies  sec. ???" PROTECTEDTITLECACHE="true" DOUBTFUL="false" TAXONSTATUSUNKNOWN="false" TAXONOMICCHILDRENCOUNT="0" TAXONNAME_FK="9" SEC_ID="1" TAXONOMICPARENTCACHE_ID="1"/>\r
+  <REFERENCEBASE DTYPE="Book" ID="1" CREATED="2008-12-10 09:56:07.0" UUID="596b1325-be50-4b0a-9aa2-3ecd610215f2" UPDATED="2008-12-10 09:56:07.253" TITLECACHE="Lorem ipsum" PROTECTEDTITLECACHE="true" NOMENCLATURALLYRELEVANT="false" HASPROBLEM="false" PROBLEMENDS="-1" PROBLEMSTARTS="-1"/>\r
+  <REFERENCEBASE DTYPE="WebPage" ID="2" CREATED="2008-12-10 09:56:07.0" UUID="ad4322b7-4b05-48af-be70-f113e46c545e" UPDATED="2008-12-10 09:56:07.253" TITLECACHE="cate-sphingidae.org" PROTECTEDTITLECACHE="true" NOMENCLATURALLYRELEVANT="false" HASPROBLEM="false" PROBLEMENDS="-1" PROBLEMSTARTS="-1"/>\r
+  <TAXONBASE DTYPE="Taxon" ID="1" SEC_ID="1" CREATED="2009-03-12 11:03:52.0" UUID="9bf290fd-5438-4391-8397-ba28d1243f77" TITLECACHE="Abies sec. ???" PROTECTEDTITLECACHE="false" DOUBTFUL="false" TAXONOMICCHILDRENCOUNT="0" TAXONNAME_FK="1"/>\r
+  <TAXONBASE DTYPE="Taxon" ID="2" CREATED="2009-03-12 11:03:52.0" UUID="bf6a40e2-38d7-4390-8971-a048ea93c0b0" TITLECACHE="Abies alba sec. ???" PROTECTEDTITLECACHE="false" DOUBTFUL="false" TAXONOMICCHILDRENCOUNT="0" TAXONNAME_FK="5"/>\r
+  <TAXONBASE DTYPE="Synonym" ID="3" CREATED="2009-03-12 11:03:52.0" UUID="2622fd24-b792-44de-815b-7241b795c4ed" TITLECACHE="Abies alba Michx. sec. ???" PROTECTEDTITLECACHE="false" DOUBTFUL="false" TAXONNAME_FK="4"/>\r
+  <TAXONBASE DTYPE="Taxon" ID="4" CREATED="2009-03-12 11:03:53.0" UUID="4e53992e-8e34-45b7-afe5-972acb9bb0cc" TITLECACHE="Abies alba Mill. sec. ???" PROTECTEDTITLECACHE="false" DOUBTFUL="false" TAXONOMICCHILDRENCOUNT="0" TAXONNAME_FK="3"/>\r
+  <TAXONBASE DTYPE="Taxon" ID="5" CREATED="2009-03-12 11:03:53.0" UUID="1942101c-c6c5-4eb1-907b-c901558a0133" TITLECACHE="Abies mill. sec. ???" PROTECTEDTITLECACHE="false" DOUBTFUL="false" TAXONOMICCHILDRENCOUNT="0" TAXONNAME_FK="6"/>\r
+  <TAXONBASE DTYPE="Taxon" ID="6" CREATED="2008-12-10 09:56:07.0" UUID="8d77c380-c76a-11dd-ad8b-0800200c9a66" UPDATED="2008-12-10 09:56:07.253" TITLECACHE="Abies sec. ???" PROTECTEDTITLECACHE="true" DOUBTFUL="false" TAXONOMICCHILDRENCOUNT="1" TAXONNAME_FK="8" SEC_ID="1"/>\r
+  <TAXONBASE DTYPE="Taxon" ID="7" CREATED="2008-12-10 09:56:07.0" UUID="822d98dc-9ef7-44b7-a870-94573a3bcb46" UPDATED="2008-12-10 09:56:07.253" TITLECACHE="Abies sec. ???" PROTECTEDTITLECACHE="true" DOUBTFUL="false" TAXONOMICCHILDRENCOUNT="0" TAXONNAME_FK="9" SEC_ID="1" TAXONOMICPARENTCACHE_ID="1"/>\r
   <TAXONNAMEBASE DTYPE="BotanicalName" ID="1" CREATED="2009-03-12 11:03:52.0" UUID="a8f13935-daed-45a9-88f2-bb23ce07f6a7" TITLECACHE="Abies" PROTECTEDTITLECACHE="false" HASPROBLEM="false" FULLTITLECACHE="Abies ???" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" GENUSORUNINOMIAL="Abies" NAMECACHE="Abies" PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" ANAMORPHIC="false" BINOMHYBRID="false" HYBRIDFORMULA="false" MONOMHYBRID="false" TRINOMHYBRID="false" RANK_ID="774"/>\r
   <TAXONNAMEBASE DTYPE="BotanicalName" ID="2" CREATED="2009-03-12 11:03:52.0" UUID="f5b6c282-af1f-461f-a8a3-521a9f8c9f9b" TITLECACHE="Abies Mill." PROTECTEDTITLECACHE="false" HASPROBLEM="false" FULLTITLECACHE="Abies Mill. ???" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" GENUSORUNINOMIAL="Abies" NAMECACHE="Abies" PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="alba" ANAMORPHIC="false" BINOMHYBRID="false" HYBRIDFORMULA="false" MONOMHYBRID="false" TRINOMHYBRID="false" RANK_ID="774"/>\r
   <TAXONNAMEBASE DTYPE="BotanicalName" ID="3" CREATED="2009-03-12 11:03:52.0" UUID="9eb9f192-3029-42b9-8d35-691de8b81ac1" TITLECACHE="Abies alba Mill." PROTECTEDTITLECACHE="true" HASPROBLEM="false" FULLTITLECACHE="Abies alba Mill. ???" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="Mill." GENUSORUNINOMIAL="Abies" NAMECACHE="Abies alba" PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" ANAMORPHIC="false" BINOMHYBRID="false" HYBRIDFORMULA="false" MONOMHYBRID="false" TRINOMHYBRID="false" RANK_ID="765" COMBINATIONAUTHORTEAM_ID="1"/>\r
@@ -21,8 +23,8 @@
   <TAXONNAMEBASE DTYPE="BotanicalName" ID="5" CREATED="2009-03-12 11:03:52.0" UUID="d72ad0b8-e9a7-479b-9efe-5a723ab9380b" TITLECACHE="Abies alba" PROTECTEDTITLECACHE="false" HASPROBLEM="false" FULLTITLECACHE="Abies alba ???" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" GENUSORUNINOMIAL="Abies" NAMECACHE="Abies alba" PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="alba" ANAMORPHIC="false" BINOMHYBRID="false" HYBRIDFORMULA="false" MONOMHYBRID="false" TRINOMHYBRID="false" RANK_ID="765" COMBINATIONAUTHORTEAM_ID="2"/>\r
   <TAXONNAMEBASE DTYPE="BotanicalName" ID="6" CREATED="2009-03-12 11:03:52.0" UUID="f5b6c282-af1f-461f-a8a3-521a9f8c9f9b" TITLECACHE="Abies mill." PROTECTEDTITLECACHE="false" HASPROBLEM="false" FULLTITLECACHE="Abies mill. ???" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" GENUSORUNINOMIAL="Abies" NAMECACHE="Abies" PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="alba" ANAMORPHIC="false" BINOMHYBRID="false" HYBRIDFORMULA="false" MONOMHYBRID="false" TRINOMHYBRID="false" RANK_ID="765"/>\r
   <TAXONNAMEBASE DTYPE="BotanicalName" ID="7" CREATED="2009-03-12 11:03:52.0" UUID="f5b6c282-af1f-461f-a8a3-521a9f8c9f9b" TITLECACHE="Aab Mill." PROTECTEDTITLECACHE="false" HASPROBLEM="false" FULLTITLECACHE="Aab Mill. ???" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" GENUSORUNINOMIAL="Abies" NAMECACHE="Aab" PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="alba" ANAMORPHIC="false" BINOMHYBRID="false" HYBRIDFORMULA="false" MONOMHYBRID="false" TRINOMHYBRID="false" RANK_ID="765"/>\r
-  <TAXONNAMEBASE DTYPE="BotanicalName" ID="8" CREATED="2008-12-10 09:56:07.0" UUID="a49a3963-c4ea-4047-8588-2f8f15352730" UPDATED="2008-12-10 09:56:07.238" TITLECACHE="" PROTECTEDTITLECACHE="false" HASPROBLEM="false" FULLTITLECACHE="" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="true" AUTHORSHIPCACHE="" GENUSORUNINOMIAL="Aus" NAMECACHE="Aus" PROTECTEDAUTHORSHIPCACHE="true" PROTECTEDNAMECACHE="true" ANAMORPHIC="false" BINOMHYBRID="false" HYBRIDFORMULA="false" MONOMHYBRID="false" TRINOMHYBRID="false" RANK_ID="774"/>\r
-  <TAXONNAMEBASE DTYPE="BotanicalName" ID="9" CREATED="2008-12-10 09:56:07.0" UUID="05a438d6-065f-49ef-84db-c7dc2c259975" UPDATED="2008-12-10 09:56:07.253" TITLECACHE=" " PROTECTEDTITLECACHE="false" HASPROBLEM="false" FULLTITLECACHE=" " PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="true" AUTHORSHIPCACHE="" GENUSORUNINOMIAL="Aus" NAMECACHE="Aus aus" PROTECTEDAUTHORSHIPCACHE="true" PROTECTEDNAMECACHE="true" SPECIFICEPITHET="aus" ANAMORPHIC="false" BINOMHYBRID="false" HYBRIDFORMULA="false" MONOMHYBRID="false" TRINOMHYBRID="false" RANK_ID="765"/>\r
+  <TAXONNAMEBASE DTYPE="BotanicalName" ID="8" CREATED="2008-12-10 09:56:07.0" UUID="a49a3963-c4ea-4047-8588-2f8f15352730" UPDATED="2008-12-10 09:56:07.238" TITLECACHE="" PROTECTEDTITLECACHE="false" HASPROBLEM="false" FULLTITLECACHE="" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="true" AUTHORSHIPCACHE="" GENUSORUNINOMIAL="Abies" NAMECACHE="Abies" PROTECTEDAUTHORSHIPCACHE="true" PROTECTEDNAMECACHE="true" ANAMORPHIC="false" BINOMHYBRID="false" HYBRIDFORMULA="false" MONOMHYBRID="false" TRINOMHYBRID="false" RANK_ID="774"/>\r
+  <TAXONNAMEBASE DTYPE="BotanicalName" ID="9" CREATED="2008-12-10 09:56:07.0" UUID="05a438d6-065f-49ef-84db-c7dc2c259975" UPDATED="2008-12-10 09:56:07.253" TITLECACHE=" " PROTECTEDTITLECACHE="false" HASPROBLEM="false" FULLTITLECACHE=" " PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="true" AUTHORSHIPCACHE="" GENUSORUNINOMIAL="Abies" NAMECACHE="Abies alba" PROTECTEDAUTHORSHIPCACHE="true" PROTECTEDNAMECACHE="true" SPECIFICEPITHET="aus" ANAMORPHIC="false" BINOMHYBRID="false" HYBRIDFORMULA="false" MONOMHYBRID="false" TRINOMHYBRID="false" RANK_ID="765"/>\r
   <REFERENCEBASE DTYPE="Book" ID="1" CREATED="2008-12-10 09:56:07.0" UUID="596b1325-be50-4b0a-9aa2-3ecd610215f2" UPDATED="2008-12-10 09:56:07.253" TITLECACHE="Lorem ipsum" PROTECTEDTITLECACHE="true" NOMENCLATURALLYRELEVANT="false" HASPROBLEM="false" PROBLEMENDS="-1" PROBLEMSTARTS="-1"/>\r
 </dataset>\r
-       
\ No newline at end of file
+       \r