ref #8281 add doubtful to TaxonNode

author Andreas Müller <a.mueller@bgbm.org>

Tue, 23 Jul 2019 20:08:50 +0000 (22:08 +0200)

committer Andreas Müller <a.mueller@bgbm.org>

Tue, 23 Jul 2019 20:17:21 +0000 (22:17 +0200)
author Andreas Müller <a.mueller@bgbm.org>
Tue, 23 Jul 2019 20:08:50 +0000 (22:08 +0200)
committer Andreas Müller <a.mueller@bgbm.org>
Tue, 23 Jul 2019 20:17:21 +0000 (22:17 +0200)
diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java

index bc49530639e7b5b530b475d7edb940e350b19ffa..32fb50e9ae92a4096d17883f386323650ebec66e 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java
@@ -177,11 +177,11 @@ public class TaxonNode
      public boolean isUnplaced() {return unplaced;}
      public void setUnplaced(boolean unplaced) {this.unplaced = unplaced;}
  
-//    //#8281 indicates a preliminary placement
-//    @XmlAttribute(name= "doubtful")
-//    private boolean doubtful = false;
-//    public boolean isDoubtful() {return doubtful;}
-//    public void setDoubtful(boolean doubtful) {this.doubtful = doubtful;}
+    //#8281 indicates a preliminary placement
+    @XmlAttribute(name= "doubtful")
+    private boolean doubtful = false;
+    public boolean isDoubtful() {return doubtful;}
+    public void setDoubtful(boolean doubtful) {this.doubtful = doubtful;}
  
      @XmlAttribute(name= "excluded")
      private boolean excluded = false;
diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v55_58/SchemaUpdater_55_58.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v55_58/SchemaUpdater_55_58.java

index 61f8f0ced6020fb5f5fd680a17a604f440da195f..0f9ae21c94827ff089bb8547d6303ea533d27939 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v55_58/SchemaUpdater_55_58.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v55_58/SchemaUpdater_55_58.java
@@ -180,6 +180,13 @@ public class SchemaUpdater_55_58 extends SchemaUpdaterBase {
         //#7470
         updateFreeTextTypeDesignation(stepList);
  
+       //#8281
+       stepName = "Add doubtful to TaxonNode";
+       tableName = "TaxonNode";
+       newColumnName = "doubtful";
+       step = ColumnAdder.NewBooleanInstance(stepName, tableName, newColumnName, INCLUDE_AUDIT, false);
+       stepList.add(step);
+
         return stepList;
         }
  
diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/PreferenceDaoTest.testFindTaxonNodeString.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/PreferenceDaoTest.testFindTaxonNodeString.xml

index 19703dda2b53e6b168de0acc8f8cbcc61c84ebf6..c081d8ade4839fcbbd2c2fb205895d66346d88e8 100644 (file)
--- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/PreferenceDaoTest.testFindTaxonNodeString.xml
+++ b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/PreferenceDaoTest.testFindTaxonNodeString.xml
@@ -7,10 +7,10 @@
    <TAXONBASE DTYPE="Taxon" ID="5000" CREATED="2016-06-03 16:48:00.0" UUID="db5b95d5-b08a-4e3c-aaee-cfe491ba2dd5" UPDATED="[null]" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" SECMICROREFERENCE="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="??? sec. ???" APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" NAME_ID="[null]" SEC_ID="[null]"/>
    <TAXONBASE DTYPE="Taxon" ID="5001" CREATED="2016-06-03 16:48:00.0" UUID="dcf4f8bc-363a-4a6e-8444-10a1a16bec27" UPDATED="[null]" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" SECMICROREFERENCE="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="??? sec. ???" APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" NAME_ID="[null]" SEC_ID="[null]"/>
    <TAXONBASE DTYPE="Taxon" ID="5002" CREATED="2016-06-03 16:48:00.0" UUID="03b4c26a-8a81-4e48-93ec-474123edf77e" UPDATED="[null]" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" SECMICROREFERENCE="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="??? sec. ???" APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" NAME_ID="[null]" SEC_ID="[null]"/>
-  <TAXONNODE ID="5000" CREATED="2016-06-03 16:48:00.0" UUID="0ed24553-1ee8-423d-9233-37b59dbf9f79" UPDATED="2016-06-03 16:48:00.946" SORTINDEX="-1" TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
-  <TAXONNODE ID="5001" CREATED="2016-06-03 16:48:00.0" UUID="4ca97177-744d-4a20-99cc-8ab9bd38bc11" UPDATED="2016-06-03 16:48:00.946" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
-  <TAXONNODE ID="5002" CREATED="2016-06-03 16:48:00.0" UUID="55108b5c-48fa-4a65-a87f-a7dddc5cd7d1" UPDATED="2016-06-03 16:48:00.946" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5002#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5001" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>
-  <TAXONNODE ID="5003" CREATED="2016-06-03 16:48:00.0" UUID="41808a50-8d48-4896-b49d-865e5b278b19" UPDATED="2016-06-03 16:48:00.946" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5002#5003#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5002" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5002"/>
+  <TAXONNODE ID="5000" CREATED="2016-06-03 16:48:00.0" UUID="0ed24553-1ee8-423d-9233-37b59dbf9f79" UPDATED="2016-06-03 16:48:00.946" SORTINDEX="-1" TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
+  <TAXONNODE ID="5001" CREATED="2016-06-03 16:48:00.0" UUID="4ca97177-744d-4a20-99cc-8ab9bd38bc11" UPDATED="2016-06-03 16:48:00.946" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
+  <TAXONNODE ID="5002" CREATED="2016-06-03 16:48:00.0" UUID="55108b5c-48fa-4a65-a87f-a7dddc5cd7d1" UPDATED="2016-06-03 16:48:00.946" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5002#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5001" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>
+  <TAXONNODE ID="5003" CREATED="2016-06-03 16:48:00.0" UUID="41808a50-8d48-4896-b49d-865e5b278b19" UPDATED="2016-06-03 16:48:00.946" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5002#5003#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5002" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5002"/>
    <LANGUAGESTRING ID="5000" UUID="fcecb73e-ddc8-4997-9a57-cfa04cf43791" TEXT="My classification" LANGUAGE_ID="406"/>  
    <HIBERNATE_SEQUENCES SEQUENCE_NAME="AuditEvent" NEXT_VAL="5002"/>
    <HIBERNATE_SEQUENCES SEQUENCE_NAME="Classification" NEXT_VAL="5001"/>
diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/ClassificationDaoHibernateImplTest.listRankSpecificRootNodes.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/ClassificationDaoHibernateImplTest.listRankSpecificRootNodes.xml

index 7251db8111b9538011fde53b3229eb18eb3c8bbb..304609a8709f7de92bcfd0167317f4a7a106035a 100644 (file)
--- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/ClassificationDaoHibernateImplTest.listRankSpecificRootNodes.xml
+++ b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/ClassificationDaoHibernateImplTest.listRankSpecificRootNodes.xml
@@ -19,15 +19,15 @@
    <TAXONNAME NAMETYPE="ICNAFP" ID="5002" CREATED="2015-06-18 09:36:39.0" UUID="94d83bdf-6b01-48cf-9f66-c408172812c9" PROTECTEDTITLECACHE="false" TITLECACHE="Abies kawakamii" FULLTITLECACHE="Abies kawakamii" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" BINOMHYBRID="false" GENUSORUNINOMIAL="[null]" HYBRIDFORMULA="false" INFRAGENERICEPITHET="[null]" MONOMHYBRID="false" NAMECACHE="Abies kawakamii" PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="true" SPECIFICEPITHET="[null]" TRINOMHYBRID="false" ANAMORPHIC="false" HOMOTYPICALGROUP_ID="5002" RANK_ID="765" />
    <TAXONNAME NAMETYPE="ICNAFP" ID="5003" CREATED="2015-06-18 09:36:39.0" UUID="0163311a-0f57-4e4b-8ded-5c57f888892b" PROTECTEDTITLECACHE="false" TITLECACHE="Abies"           FULLTITLECACHE="Abies"           PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" BINOMHYBRID="false" GENUSORUNINOMIAL="[null]" HYBRIDFORMULA="false" INFRAGENERICEPITHET="[null]" MONOMHYBRID="false" NAMECACHE="Abies"           PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="true" SPECIFICEPITHET="[null]" TRINOMHYBRID="false" ANAMORPHIC="false" HOMOTYPICALGROUP_ID="5003" RANK_ID="774" />
    <TAXONNAME NAMETYPE="ICNAFP" ID="5004" CREATED="2015-06-18 09:36:39.0" UUID="65ece834-4b07-4ce6-9dda-7fead7569101" PROTECTEDTITLECACHE="false" TITLECACHE="Pinaceae"        FULLTITLECACHE="Pinaceae"        PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" BINOMHYBRID="false" GENUSORUNINOMIAL="[null]" HYBRIDFORMULA="false" INFRAGENERICEPITHET="[null]" MONOMHYBRID="false" NAMECACHE="Pinaceae"        PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="true" SPECIFICEPITHET="[null]" TRINOMHYBRID="false" ANAMORPHIC="false" HOMOTYPICALGROUP_ID="5004" RANK_ID="782" />
-  <TAXONNODE ID="5000" CREATED="2015-06-18 09:36:39.0" UUID="75202d4e-b2aa-4343-8b78-340a52d15c40" SORTINDEX="-1" TREEINDEX="#t5000#5000#"      COUNTCHILDREN="3" TAXON_ID="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="5000" PARENT_ID="[null]"/>
-  <TAXONNODE ID="5002" CREATED="2015-06-18 09:36:39.0" UUID="6b76c838-bd8f-43f9-8fa9-077cd222a9b2" SORTINDEX="0"  TREEINDEX="#t5000#5000#5002#" COUNTCHILDREN="0" TAXON_ID="5000"   EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="5000" PARENT_ID="5000"/>
-  <TAXONNODE ID="5003" CREATED="2015-06-18 09:36:39.0" UUID="c2c0afb9-64d1-4eb3-95dd-4599d9978aea" SORTINDEX="1"  TREEINDEX="#t5000#5000#5003#" COUNTCHILDREN="0" TAXON_ID="5001"   EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="5000" PARENT_ID="5000"/>
-  <TAXONNODE ID="5004" CREATED="2015-06-18 09:36:39.0" UUID="ebbae10f-d179-4a08-9939-9fed0a7f1433" SORTINDEX="2"  TREEINDEX="#t5000#5000#5004#" COUNTCHILDREN="0" TAXON_ID="5002"   EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="5000" PARENT_ID="5000"/>
-  <TAXONNODE ID="5001" CREATED="2015-06-18 09:36:39.0" UUID="7b95a2a6-2c6e-4b8e-a91a-7a1d995490f9" SORTINDEX="-1" TREEINDEX="#t5001#5001#"      COUNTCHILDREN="1" TAXON_ID="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="5001" PARENT_ID="[null]"/>
-  <TAXONNODE ID="5007" CREATED="2015-06-18 09:36:40.0" UUID="bcdf945f-1f02-423e-883d-fe89e0af93e4" SORTINDEX="0"  TREEINDEX="#t5001#5001#5007#"           COUNTCHILDREN="1" TAXON_ID="5004" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="5001" PARENT_ID="5001"/>
-  <TAXONNODE ID="5006" CREATED="2015-06-18 09:36:40.0" UUID="56b10cf0-9522-407e-9f90-0c2dba263c94" SORTINDEX="0"  TREEINDEX="#t5001#5001#5007#5006#"      COUNTCHILDREN="2" TAXON_ID="5003" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="5001" PARENT_ID="5007"/>
-  <TAXONNODE ID="5005" CREATED="2015-06-18 09:36:40.0" UUID="ba290371-a72b-43bf-a913-8a03c79755c7" SORTINDEX="0"  TREEINDEX="#t5001#5001#5007#5006#5005#" COUNTCHILDREN="0" TAXON_ID="5000" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="5001" PARENT_ID="5006"/>
-  <TAXONNODE ID="5008" CREATED="2015-06-18 09:36:40.0" UUID="80150ae0-e1e6-42a4-b224-21e099756c3d" SORTINDEX="1"  TREEINDEX="#t5001#5001#5007#5006#5008#" COUNTCHILDREN="0" TAXON_ID="5001" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="5001" PARENT_ID="5006"/>
+  <TAXONNODE ID="5000" CREATED="2015-06-18 09:36:39.0" UUID="75202d4e-b2aa-4343-8b78-340a52d15c40" SORTINDEX="-1" TREEINDEX="#t5000#5000#"      COUNTCHILDREN="3" TAXON_ID="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="5000" PARENT_ID="[null]"/>
+  <TAXONNODE ID="5002" CREATED="2015-06-18 09:36:39.0" UUID="6b76c838-bd8f-43f9-8fa9-077cd222a9b2" SORTINDEX="0"  TREEINDEX="#t5000#5000#5002#" COUNTCHILDREN="0" TAXON_ID="5000"   EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="5000" PARENT_ID="5000"/>
+  <TAXONNODE ID="5003" CREATED="2015-06-18 09:36:39.0" UUID="c2c0afb9-64d1-4eb3-95dd-4599d9978aea" SORTINDEX="1"  TREEINDEX="#t5000#5000#5003#" COUNTCHILDREN="0" TAXON_ID="5001"   EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="5000" PARENT_ID="5000"/>
+  <TAXONNODE ID="5004" CREATED="2015-06-18 09:36:39.0" UUID="ebbae10f-d179-4a08-9939-9fed0a7f1433" SORTINDEX="2"  TREEINDEX="#t5000#5000#5004#" COUNTCHILDREN="0" TAXON_ID="5002"   EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="5000" PARENT_ID="5000"/>
+  <TAXONNODE ID="5001" CREATED="2015-06-18 09:36:39.0" UUID="7b95a2a6-2c6e-4b8e-a91a-7a1d995490f9" SORTINDEX="-1" TREEINDEX="#t5001#5001#"      COUNTCHILDREN="1" TAXON_ID="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="5001" PARENT_ID="[null]"/>
+  <TAXONNODE ID="5007" CREATED="2015-06-18 09:36:40.0" UUID="bcdf945f-1f02-423e-883d-fe89e0af93e4" SORTINDEX="0"  TREEINDEX="#t5001#5001#5007#"           COUNTCHILDREN="1" TAXON_ID="5004" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="5001" PARENT_ID="5001"/>
+  <TAXONNODE ID="5006" CREATED="2015-06-18 09:36:40.0" UUID="56b10cf0-9522-407e-9f90-0c2dba263c94" SORTINDEX="0"  TREEINDEX="#t5001#5001#5007#5006#"      COUNTCHILDREN="2" TAXON_ID="5003" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="5001" PARENT_ID="5007"/>
+  <TAXONNODE ID="5005" CREATED="2015-06-18 09:36:40.0" UUID="ba290371-a72b-43bf-a913-8a03c79755c7" SORTINDEX="0"  TREEINDEX="#t5001#5001#5007#5006#5005#" COUNTCHILDREN="0" TAXON_ID="5000" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="5001" PARENT_ID="5006"/>
+  <TAXONNODE ID="5008" CREATED="2015-06-18 09:36:40.0" UUID="80150ae0-e1e6-42a4-b224-21e099756c3d" SORTINDEX="1"  TREEINDEX="#t5001#5001#5007#5006#5008#" COUNTCHILDREN="0" TAXON_ID="5001" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="5001" PARENT_ID="5006"/>
    <LANGUAGESTRING ID="5000" CREATED="2015-06-18 09:36:39.0" UUID="09a89e2e-4d9c-417d-bcd0-30ecffbae531" TEXT="European Abies" LANGUAGE_ID="406"/>
    <LANGUAGESTRING ID="5001" CREATED="2015-06-18 09:36:39.0" UUID="40bf3ed6-f6b9-4c12-b2e3-69f682bb38d8" TEXT="European Abies full hierarchie" LANGUAGE_ID="406"/>
    <HIBERNATE_SEQUENCES SEQUENCE_NAME="Classification" NEXT_VAL="5002"/>
diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testGetTaxaByNameAndArea.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testGetTaxaByNameAndArea.xml

index cbcea473da8cc9beed5da82a9720ccdd23b010bf..904da9217eff69d1e54b50a127e473235702bdc8 100644 (file)
--- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testGetTaxaByNameAndArea.xml
+++ b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testGetTaxaByNameAndArea.xml
@@ -141,16 +141,16 @@
    <TAXONNAME NAMETYPE="ICNAFP" ID="39" CREATED="2008-12-10 09:56:07.0" UUID="75f698b8-7fcb-4999-aa9d-6b84be6cef94" TITLECACHE="Picris asplenioides L. subsp. asplenioides" PROTECTEDTITLECACHE="true" PARSINGPROBLEM="0" FULLTITLECACHE="" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="true" AUTHORSHIPCACHE="L."                NAMECACHE="Picris asplenioides L. subsp. asplenioides" PROTECTEDAUTHORSHIPCACHE="true" PROTECTEDNAMECACHE="true" ANAMORPHIC="false" BINOMHYBRID="false" HYBRIDFORMULA="false" MONOMHYBRID="false" TRINOMHYBRID="false" HOMOTYPICALGROUP_ID="37" RANK_ID="773" GENUSORUNINOMIAL="Picris" SPECIFICEPITHET="Picris asplenioides" INFRASPECIFICEPITHET="asplenioides" NOMENCLATURALREFERENCE_ID="1"/>
    <TAXONNAME NAMETYPE="ICNAFP" ID="41" CREATED="2008-12-10 09:56:07.0" UUID="accc9ba2-07bf-45c0-85b1-6d44e63020f9" TITLECACHE="Ricris asplenioides L. subsp. asplenioides" PROTECTEDTITLECACHE="true" PARSINGPROBLEM="0" FULLTITLECACHE="" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="true" AUTHORSHIPCACHE="L."                NAMECACHE="Ricris asplenioides L. subsp. asplenioides" PROTECTEDAUTHORSHIPCACHE="true" PROTECTEDNAMECACHE="true" ANAMORPHIC="false" BINOMHYBRID="false" HYBRIDFORMULA="false" MONOMHYBRID="false" TRINOMHYBRID="false" HOMOTYPICALGROUP_ID="37" RANK_ID="773" GENUSORUNINOMIAL="Ricris" SPECIFICEPITHET="Ricris asplenioides" INFRASPECIFICEPITHET="asplenioides" NOMENCLATURALREFERENCE_ID="1"/>
  
-  <TAXONNODE ID="1"  CREATED="2009-06-18 13:47:59.0" UUID="6d6b43aa-3a77-4be5-91d0-00b702fc5d6e" COUNTCHILDREN="0" TAXON_ID="[null]" CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE"/>
-  <TAXONNODE ID="2"  CREATED="2009-06-18 13:47:59.0" UUID="0b5846e5-b8d2-4ca9-ac51-099286ea4adc" COUNTCHILDREN="0" TAXON_ID="19"     CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE"/>
-  <TAXONNODE ID="3"  CREATED="2009-06-18 13:47:59.0" UUID="770239f6-4fa8-496b-8738-fe8f7b2ad519" COUNTCHILDREN="0" TAXON_ID="18"     CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE"/>
-  <TAXONNODE ID="4"  CREATED="2009-06-18 13:47:59.0" UUID="44a51ccc-1517-4a43-a9f1-ec296ad90982" COUNTCHILDREN="0" TAXON_ID="39"     CLASSIFICATION_ID="2" EXCLUDED="FALSE" UNPLACED="FALSE"/>
-  <TAXONNODE ID="5"  CREATED="2009-06-18 13:47:59.0" UUID="8f58324e-1528-4de2-a65e-8993a7ddf2c5" COUNTCHILDREN="0" TAXON_ID="38"     CLASSIFICATION_ID="2" EXCLUDED="FALSE" UNPLACED="FALSE"/>
-  <TAXONNODE ID="6"  CREATED="2009-06-18 13:47:59.0" UUID="98e8411f-f022-4222-9879-43d69549e467" COUNTCHILDREN="0" TAXON_ID="40"     CLASSIFICATION_ID="2" EXCLUDED="FALSE" UNPLACED="FALSE"/>
-  <TAXONNODE ID="7"  CREATED="2009-06-18 13:47:59.0" UUID="aa7d9156-6ff1-4c76-827c-9798de5d04bf" COUNTCHILDREN="0" TAXON_ID="38"     CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE"/>
-  <TAXONNODE ID="8"  CREATED="2009-06-18 13:47:59.0" UUID="17ff1a4e-9bbd-4911-91a9-0376ee419fef" COUNTCHILDREN="0" TAXON_ID="17"     CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE"/>
-  <TAXONNODE ID="9"  CREATED="2009-06-18 13:47:59.0" UUID="9741d098-d090-4544-8712-2310c3cf6792" COUNTCHILDREN="0" TAXON_ID="41"     CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE"/>
-  <TAXONNODE ID="10" CREATED="2009-06-18 13:47:59.0" UUID="5b9559b1-9b1f-41bc-9e16-f4512146a26d" COUNTCHILDREN="0" TAXON_ID="[null]" CLASSIFICATION_ID="2" EXCLUDED="FALSE" UNPLACED="FALSE"/>
+  <TAXONNODE ID="1"  CREATED="2009-06-18 13:47:59.0" UUID="6d6b43aa-3a77-4be5-91d0-00b702fc5d6e" COUNTCHILDREN="0" TAXON_ID="[null]" CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
+  <TAXONNODE ID="2"  CREATED="2009-06-18 13:47:59.0" UUID="0b5846e5-b8d2-4ca9-ac51-099286ea4adc" COUNTCHILDREN="0" TAXON_ID="19"     CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
+  <TAXONNODE ID="3"  CREATED="2009-06-18 13:47:59.0" UUID="770239f6-4fa8-496b-8738-fe8f7b2ad519" COUNTCHILDREN="0" TAXON_ID="18"     CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
+  <TAXONNODE ID="4"  CREATED="2009-06-18 13:47:59.0" UUID="44a51ccc-1517-4a43-a9f1-ec296ad90982" COUNTCHILDREN="0" TAXON_ID="39"     CLASSIFICATION_ID="2" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
+  <TAXONNODE ID="5"  CREATED="2009-06-18 13:47:59.0" UUID="8f58324e-1528-4de2-a65e-8993a7ddf2c5" COUNTCHILDREN="0" TAXON_ID="38"     CLASSIFICATION_ID="2" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
+  <TAXONNODE ID="6"  CREATED="2009-06-18 13:47:59.0" UUID="98e8411f-f022-4222-9879-43d69549e467" COUNTCHILDREN="0" TAXON_ID="40"     CLASSIFICATION_ID="2" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
+  <TAXONNODE ID="7"  CREATED="2009-06-18 13:47:59.0" UUID="aa7d9156-6ff1-4c76-827c-9798de5d04bf" COUNTCHILDREN="0" TAXON_ID="38"     CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
+  <TAXONNODE ID="8"  CREATED="2009-06-18 13:47:59.0" UUID="17ff1a4e-9bbd-4911-91a9-0376ee419fef" COUNTCHILDREN="0" TAXON_ID="17"     CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
+  <TAXONNODE ID="9"  CREATED="2009-06-18 13:47:59.0" UUID="9741d098-d090-4544-8712-2310c3cf6792" COUNTCHILDREN="0" TAXON_ID="41"     CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
+  <TAXONNODE ID="10" CREATED="2009-06-18 13:47:59.0" UUID="5b9559b1-9b1f-41bc-9e16-f4512146a26d" COUNTCHILDREN="0" TAXON_ID="[null]" CLASSIFICATION_ID="2" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
  
    <TAXONRELATIONSHIP ID="1" CREATED="2009-06-18 13:47:59.0" UUID="1e7afe1f-306c-4b9f-8e30-4b05f7478822" RELATEDFROM_ID="39" RELATEDTO_ID="19" DOUBTFUL="false" TYPE_ID="888"/>
    <TAXONRELATIONSHIP ID="2" CREATED="2009-06-18 13:47:59.0" UUID="8d50cecd-c59c-4567-b6f3-4595550c49fa" RELATEDFROM_ID="1"  RELATEDTO_ID="19" DOUBTFUL="false" TYPE_ID="888"/>
diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testPropertyPath.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testPropertyPath.xml

index 6bdc1190b6519f6589e3139691553f8bacef4aee..94de3e94c5a7390ff1de627e5561a025f92ee043 100644 (file)
--- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testPropertyPath.xml
+++ b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testPropertyPath.xml
@@ -1,8 +1,8 @@
  <?xml version='1.0' encoding='UTF-8'?>
  <dataset>
    <CLASSIFICATION ID="5000" CREATED="2015-10-22 12:33:25.0" UUID="4bceea53-893f-4685-8c63-6dcec6e85ab1" UPDATED="[null]" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Test" MICROREFERENCE="[null]" TIMEPERIOD_START="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_END="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" NAME_ID="5000" REFERENCE_ID="[null]" ROOTNODE_ID="5000"/>
-  <TAXONNODE ID="5000" CREATED="2015-10-22 12:33:25.0" UUID="eddefefd-0d00-4d2d-9497-6b64631c8f75" UPDATED="2015-10-22 12:33:25.548" SORTINDEX="-1" TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
-  <TAXONNODE ID="5001" CREATED="2015-10-22 12:33:25.0" UUID="23606836-b7e0-4b09-8a34-90699547fa6e" UPDATED="2015-10-22 12:33:25.548" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
+  <TAXONNODE ID="5000" CREATED="2015-10-22 12:33:25.0" UUID="eddefefd-0d00-4d2d-9497-6b64631c8f75" UPDATED="2015-10-22 12:33:25.548" SORTINDEX="-1" TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
+  <TAXONNODE ID="5001" CREATED="2015-10-22 12:33:25.0" UUID="23606836-b7e0-4b09-8a34-90699547fa6e" UPDATED="2015-10-22 12:33:25.548" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
    <TAXONBASE DTYPE="Taxon" ID="5000" CREATED="2015-10-22 12:33:25.0" UUID="4a5bc930-844f-45ec-aea8-dd155e1ab25f" UPDATED="[null]" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Taxon#0&lt;4a5bc930-844f-45ec-aea8-dd155e1ab25f&gt;" APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" NAME_ID="[null]" SEC_ID="[null]"/>
    <LANGUAGESTRING ID="5000" CREATED="2015-10-22 12:33:25.0" UUID="770090f5-7f8a-42bf-8977-253ad714ad84" UPDATED="[null]" TEXT="Test" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" LANGUAGE_ID="406"/>
    <HIBERNATE_SEQUENCES SEQUENCE_NAME="Classification" NEXT_VAL="5001"/>
diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.xml

index e31deefd2f63460aae80e2a80b9f8a7c137a5b93..67358422c677b9712724c475c0dbd4fec6baf025 100644 (file)
--- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.xml
+++ b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.xml
@@ -22,14 +22,14 @@
    <REFERENCE  ID="3" CREATED="2008-12-10 09:56:07.0" UUID="3eea6f96-0682-4025-8cdd-aaaf7c915ae2" UPDATED="2008-12-10 09:56:07.253" TITLECACHE="cate-araceae.org" PROTECTEDTITLECACHE="true" PROTECTEDABBREVTITLECACHE="false" ABBREVTITLECACHE="Sp. Pl." ABBREVTITLE="Sp. Pl." NOMENCLATURALLYRELEVANT="false" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1"/>\r
    <CLASSIFICATION ID="5000" CREATED="2015-06-18 09:36:39.0" UUID="2a5ceebb-4830-4524-b330-78461bf8cb6b" PROTECTEDTITLECACHE="true" TITLECACHE="Classification 1" ROOTNODE_ID="5000"/>\r
    <CLASSIFICATION ID="5001" CREATED="2015-06-18 09:36:39.0" UUID="a71467a6-74dc-4148-9530-484628a5ab0e" PROTECTEDTITLECACHE="true" TITLECACHE="Classification 2" ROOTNODE_ID="5001"/>\r
-  <TAXONNODE ID="5000" CREATED="2015-06-18 09:36:39.0" UUID="75202d4e-b2aa-4343-8b78-340a52d15c40" SORTINDEX="-1" TREEINDEX="#t5000#5000#"      COUNTCHILDREN="3" TAXON_ID="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="5000" PARENT_ID="[null]"/>\r
-  <TAXONNODE ID="5002" CREATED="2015-06-18 09:36:39.0" UUID="6b76c838-bd8f-43f9-8fa9-077cd222a9b2" SORTINDEX="0"  TREEINDEX="#t5000#5000#5002#" COUNTCHILDREN="0" TAXON_ID="1"   EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="5000" PARENT_ID="5000"/>\r
-  <TAXONNODE ID="5004" CREATED="2015-06-18 09:36:39.0" UUID="ebbae10f-d179-4a08-9939-9fed0a7f1433" SORTINDEX="2"  TREEINDEX="#t5000#5000#5004#" COUNTCHILDREN="0" TAXON_ID="5002"   EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="5000" PARENT_ID="5000"/>\r
-  <TAXONNODE ID="5001" CREATED="2015-06-18 09:36:39.0" UUID="7b95a2a6-2c6e-4b8e-a91a-7a1d995490f9" SORTINDEX="-1" TREEINDEX="#t5001#5001#"                COUNTCHILDREN="1" TAXON_ID="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="5001" PARENT_ID="[null]"/>\r
-  <TAXONNODE ID="5007" CREATED="2015-06-18 09:36:40.0" UUID="bcdf945f-1f02-423e-883d-fe89e0af93e4" SORTINDEX="0"  TREEINDEX="#t5001#5001#5007#"           COUNTCHILDREN="1" TAXON_ID="3"      EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="5001" PARENT_ID="5001"/>\r
-  <TAXONNODE ID="5006" CREATED="2015-06-18 09:36:40.0" UUID="56b10cf0-9522-407e-9f90-0c2dba263c94" SORTINDEX="0"  TREEINDEX="#t5001#5001#5007#5006#"      COUNTCHILDREN="2" TAXON_ID="15"     EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="5001" PARENT_ID="5007"/>\r
-  <TAXONNODE ID="5005" CREATED="2015-06-18 09:36:40.0" UUID="ba290371-a72b-43bf-a913-8a03c79755c7" SORTINDEX="0"  TREEINDEX="#t5001#5001#5007#5006#5005#" COUNTCHILDREN="0" TAXON_ID="35"     EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="5001" PARENT_ID="5006"/>\r
-  <TAXONNODE ID="5008" CREATED="2015-06-18 09:36:40.0" UUID="80150ae0-e1e6-42a4-b224-21e099756c3d" SORTINDEX="1"  TREEINDEX="#t5001#5001#5007#5006#5008#" COUNTCHILDREN="0" TAXON_ID="36"     EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="5001" PARENT_ID="5006"/>\r
+  <TAXONNODE ID="5000" CREATED="2015-06-18 09:36:39.0" UUID="75202d4e-b2aa-4343-8b78-340a52d15c40" SORTINDEX="-1" TREEINDEX="#t5000#5000#"      COUNTCHILDREN="3" TAXON_ID="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="5000" PARENT_ID="[null]"/>\r
+  <TAXONNODE ID="5002" CREATED="2015-06-18 09:36:39.0" UUID="6b76c838-bd8f-43f9-8fa9-077cd222a9b2" SORTINDEX="0"  TREEINDEX="#t5000#5000#5002#" COUNTCHILDREN="0" TAXON_ID="1"   EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="5000" PARENT_ID="5000"/>\r
+  <TAXONNODE ID="5004" CREATED="2015-06-18 09:36:39.0" UUID="ebbae10f-d179-4a08-9939-9fed0a7f1433" SORTINDEX="2"  TREEINDEX="#t5000#5000#5004#" COUNTCHILDREN="0" TAXON_ID="5002"   EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="5000" PARENT_ID="5000"/>\r
+  <TAXONNODE ID="5001" CREATED="2015-06-18 09:36:39.0" UUID="7b95a2a6-2c6e-4b8e-a91a-7a1d995490f9" SORTINDEX="-1" TREEINDEX="#t5001#5001#"                COUNTCHILDREN="1" TAXON_ID="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="5001" PARENT_ID="[null]"/>\r
+  <TAXONNODE ID="5007" CREATED="2015-06-18 09:36:40.0" UUID="bcdf945f-1f02-423e-883d-fe89e0af93e4" SORTINDEX="0"  TREEINDEX="#t5001#5001#5007#"           COUNTCHILDREN="1" TAXON_ID="3"      EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="5001" PARENT_ID="5001"/>\r
+  <TAXONNODE ID="5006" CREATED="2015-06-18 09:36:40.0" UUID="56b10cf0-9522-407e-9f90-0c2dba263c94" SORTINDEX="0"  TREEINDEX="#t5001#5001#5007#5006#"      COUNTCHILDREN="2" TAXON_ID="15"     EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="5001" PARENT_ID="5007"/>\r
+  <TAXONNODE ID="5005" CREATED="2015-06-18 09:36:40.0" UUID="ba290371-a72b-43bf-a913-8a03c79755c7" SORTINDEX="0"  TREEINDEX="#t5001#5001#5007#5006#5005#" COUNTCHILDREN="0" TAXON_ID="35"     EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="5001" PARENT_ID="5006"/>\r
+  <TAXONNODE ID="5008" CREATED="2015-06-18 09:36:40.0" UUID="80150ae0-e1e6-42a4-b224-21e099756c3d" SORTINDEX="1"  TREEINDEX="#t5001#5001#5007#5006#5008#" COUNTCHILDREN="0" TAXON_ID="36"     EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="5001" PARENT_ID="5006"/>\r
    \r
    \r
    <TAXONBASE DTYPE="Taxon" ID="1" SEC_ID="1" CREATED="2008-01-10 09:56:07.0" UUID="496b1325-be50-4b0a-9aa2-3ecd610215f2" UPDATED="2008-12-10 09:56:07.253" TITLECACHE="Aus sec. ???" PROTECTEDTITLECACHE="true" TAXONSTATUSUNKNOWN="false"  PUBLISH="true" DOUBTFUL="false" USENAMECACHE="false" NAME_ID="1" />\r
diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.testSortindexForJavassist-result.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.testSortindexForJavassist-result.xml

index 63bbb5ecb3e8b85fe67d85ab3eb0004784a851f5..9f8559583a288b43ffab1487f458fef3252c73a5 100644 (file)
--- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.testSortindexForJavassist-result.xml
+++ b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.testSortindexForJavassist-result.xml
@@ -1,8 +1,8 @@
  <?xml version='1.0' encoding='UTF-8'?>\r
  <dataset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../database/schema/dataset.xsd">\r
-  <TAXONNODE ID="1" CREATED="2009-06-18 13:47:59.0" UUID="cf0316c9-1963-4268-8c2e-8d833c460ac3" SORTINDEX="-1" TREEINDEX="#t1#1#" COUNTCHILDREN="2" CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE"/>\r
-  <TAXONNODE ID="2" CREATED="2009-06-18 13:47:59.0" UUID="770239f6-4fa8-496b-8738-fe8f7b2ad519" SORTINDEX="0" TREEINDEX="#t1#1#3#4#2#" COUNTCHILDREN="0" CLASSIFICATION_ID="1" PARENT_ID="4" TAXON_ID="37" EXCLUDED="FALSE" UNPLACED="FALSE"/>\r
-  <TAXONNODE ID="3" CREATED="2009-06-18 13:47:59.0" UUID="20c8f083-5870-4cbd-bf56-c5b2b98ab6a7" SORTINDEX="0" TREEINDEX="#t1#1#3#" COUNTCHILDREN="1" CLASSIFICATION_ID="1" PARENT_ID="1" TAXON_ID="36" EXCLUDED="FALSE" UNPLACED="FALSE"/>\r
-  <TAXONNODE ID="4" CREATED="2009-06-18 13:47:59.0" UUID="0b5846e5-b8d2-4ca9-ac51-099286ea4adc" SORTINDEX="0" TREEINDEX="#t1#1#3#4#" COUNTCHILDREN="1" CLASSIFICATION_ID="1" PARENT_ID="3" TAXON_ID="38" EXCLUDED="FALSE" UNPLACED="FALSE"/>\r
-  <TAXONNODE ID="5" CREATED="2009-06-18 13:47:59.0" UUID="4f73adcc-a535-4fbe-a97a-c05ee8b12191" SORTINDEX="1" TREEINDEX="#t1#1#5#" COUNTCHILDREN="0" CLASSIFICATION_ID="1" PARENT_ID="1" TAXON_ID="42" EXCLUDED="FALSE" UNPLACED="FALSE"/>\r
+  <TAXONNODE ID="1" CREATED="2009-06-18 13:47:59.0" UUID="cf0316c9-1963-4268-8c2e-8d833c460ac3" SORTINDEX="-1" TREEINDEX="#t1#1#" COUNTCHILDREN="2" CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>\r
+  <TAXONNODE ID="2" CREATED="2009-06-18 13:47:59.0" UUID="770239f6-4fa8-496b-8738-fe8f7b2ad519" SORTINDEX="0" TREEINDEX="#t1#1#3#4#2#" COUNTCHILDREN="0" CLASSIFICATION_ID="1" PARENT_ID="4" TAXON_ID="37" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>\r
+  <TAXONNODE ID="3" CREATED="2009-06-18 13:47:59.0" UUID="20c8f083-5870-4cbd-bf56-c5b2b98ab6a7" SORTINDEX="0" TREEINDEX="#t1#1#3#" COUNTCHILDREN="1" CLASSIFICATION_ID="1" PARENT_ID="1" TAXON_ID="36" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>\r
+  <TAXONNODE ID="4" CREATED="2009-06-18 13:47:59.0" UUID="0b5846e5-b8d2-4ca9-ac51-099286ea4adc" SORTINDEX="0" TREEINDEX="#t1#1#3#4#" COUNTCHILDREN="1" CLASSIFICATION_ID="1" PARENT_ID="3" TAXON_ID="38" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>\r
+  <TAXONNODE ID="5" CREATED="2009-06-18 13:47:59.0" UUID="4f73adcc-a535-4fbe-a97a-c05ee8b12191" SORTINDEX="1" TREEINDEX="#t1#1#5#" COUNTCHILDREN="0" CLASSIFICATION_ID="1" PARENT_ID="1" TAXON_ID="42" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>\r
  </dataset>
 \ No newline at end of file
diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.testSortindexForJavassist.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.testSortindexForJavassist.xml

index ff6fc3ae33516d41014650a7c9150405f3e1aabd..344d480ed442f3e167d18a82ece0a48cc2534cc8 100644 (file)
--- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.testSortindexForJavassist.xml
+++ b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.testSortindexForJavassist.xml
@@ -21,11 +21,11 @@
    <TAXONNAME NAMETYPE="ICZN" ID="40"   CREATED="2008-12-10 09:56:07.0" UUID="57d756e1-9381-43f1-8705-d29e7046483a" TITLECACHE="SynGenus"                              PROTECTEDTITLECACHE="true" PARSINGPROBLEM="0" FULLTITLECACHE="" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="true" AUTHORSHIPCACHE="(Fabricius, 1797)" NAMECACHE="SynGenus"            PROTECTEDAUTHORSHIPCACHE="true" PROTECTEDNAMECACHE="true" ANAMORPHIC="false"  BINOMHYBRID="false" HYBRIDFORMULA="false" MONOMHYBRID="false" TRINOMHYBRID="false" HOMOTYPICALGROUP_ID="35" RANK_ID="774" GENUSORUNINOMIAL="SynGenus" NOMENCLATURALREFERENCE_ID="1"/>
    <TAXONNAME NAMETYPE="ICNAFP" ID="41" CREATED="2008-12-10 09:56:07.0" UUID="507b60dd-113d-4ab7-9665-25d0374bd6d1" TITLECACHE="test"                                  PROTECTEDTITLECACHE="true" PARSINGPROBLEM="0" FULLTITLECACHE="" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="true" AUTHORSHIPCACHE="(Fabricius, 1797)" NAMECACHE="Acherontia ciprosus" PROTECTEDAUTHORSHIPCACHE="true" PROTECTEDNAMECACHE="true" ANAMORPHIC="false"  BINOMHYBRID="false" HYBRIDFORMULA="false" MONOMHYBRID="false" TRINOMHYBRID="false" HOMOTYPICALGROUP_ID="35" RANK_ID="765" GENUSORUNINOMIAL="Acherontia" SPECIFICEPITHET="ciprosus" NOMENCLATURALREFERENCE_ID="1"/>
  
-  <TAXONNODE ID="1" CREATED="2009-06-18 13:47:59.0" UUID="cf0316c9-1963-4268-8c2e-8d833c460ac3" COUNTCHILDREN="3" TAXON_ID="[null]" PARENT_ID="[null]" TREEINDEX="#t1#1#"   SORTINDEX="-1" CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE"/>
-  <TAXONNODE ID="2" CREATED="2009-06-18 13:47:59.0" UUID="770239f6-4fa8-496b-8738-fe8f7b2ad519" COUNTCHILDREN="0" TAXON_ID="37"     PARENT_ID="1"      TREEINDEX="#t1#1#2#" SORTINDEX="0"  CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE"/>
-  <TAXONNODE ID="3" CREATED="2009-06-18 13:47:59.0" UUID="20c8f083-5870-4cbd-bf56-c5b2b98ab6a7" COUNTCHILDREN="1" TAXON_ID="36"     PARENT_ID="1"      TREEINDEX="#t1#1#3#" SORTINDEX="1"  CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE"/>
-  <TAXONNODE ID="4" CREATED="2009-06-18 13:47:59.0" UUID="0b5846e5-b8d2-4ca9-ac51-099286ea4adc" COUNTCHILDREN="0" TAXON_ID="38"     PARENT_ID="3"    TREEINDEX="#t1#1#3#4#" SORTINDEX="0"  CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE"/>
-  <TAXONNODE ID="5" CREATED="2009-06-18 13:47:59.0" UUID="4f73adcc-a535-4fbe-a97a-c05ee8b12191" COUNTCHILDREN="0" TAXON_ID="42"     PARENT_ID="1"      TREEINDEX="#t1#1#5#" SORTINDEX="2"  CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE"/>
+  <TAXONNODE ID="1" CREATED="2009-06-18 13:47:59.0" UUID="cf0316c9-1963-4268-8c2e-8d833c460ac3" COUNTCHILDREN="3" TAXON_ID="[null]" PARENT_ID="[null]" TREEINDEX="#t1#1#"   SORTINDEX="-1" CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
+  <TAXONNODE ID="2" CREATED="2009-06-18 13:47:59.0" UUID="770239f6-4fa8-496b-8738-fe8f7b2ad519" COUNTCHILDREN="0" TAXON_ID="37"     PARENT_ID="1"      TREEINDEX="#t1#1#2#" SORTINDEX="0"  CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
+  <TAXONNODE ID="3" CREATED="2009-06-18 13:47:59.0" UUID="20c8f083-5870-4cbd-bf56-c5b2b98ab6a7" COUNTCHILDREN="1" TAXON_ID="36"     PARENT_ID="1"      TREEINDEX="#t1#1#3#" SORTINDEX="1"  CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
+  <TAXONNODE ID="4" CREATED="2009-06-18 13:47:59.0" UUID="0b5846e5-b8d2-4ca9-ac51-099286ea4adc" COUNTCHILDREN="0" TAXON_ID="38"     PARENT_ID="3"    TREEINDEX="#t1#1#3#4#" SORTINDEX="0"  CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
+  <TAXONNODE ID="5" CREATED="2009-06-18 13:47:59.0" UUID="4f73adcc-a535-4fbe-a97a-c05ee8b12191" COUNTCHILDREN="0" TAXON_ID="42"     PARENT_ID="1"      TREEINDEX="#t1#1#5#" SORTINDEX="2"  CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
  
    <CLASSIFICATION ID="1" CREATED="2009-06-18 13:47:59.0" UUID="aeee7448-5298-4991-b724-8d5b75a0a7a9" PROTECTEDTITLECACHE="false" TITLECACHE="TestBaum" NAME_ID="1" ROOTNODE_ID="1"/>
  
diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.testSortindexForJavassist2-result.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.testSortindexForJavassist2-result.xml

index 38ee321baedbebd0f45d1ee185d0c5bd319ce0e7..1cb54948c4b9589b95c58ceb0b410613b8be25db 100644 (file)
--- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.testSortindexForJavassist2-result.xml
+++ b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.testSortindexForJavassist2-result.xml
@@ -1,9 +1,9 @@
  <?xml version='1.0' encoding='UTF-8'?>
  <dataset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../database/schema/dataset.xsd">
-  <TAXONNODE ID="1" CREATED="2009-06-18 13:47:59.0" UUID="cf0316c9-1963-4268-8c2e-8d833c460ac3" SORTINDEX="-1" TREEINDEX="#t1#1#" COUNTCHILDREN="4" CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE"/>
-  <TAXONNODE ID="2" CREATED="2009-06-18 13:47:59.0" UUID="770239f6-4fa8-496b-8738-fe8f7b2ad519" SORTINDEX="1" TREEINDEX="#t1#1#2#" COUNTCHILDREN="0" CLASSIFICATION_ID="1" PARENT_ID="1" TAXON_ID="37" EXCLUDED="FALSE" UNPLACED="FALSE"/>
-  <TAXONNODE ID="3" CREATED="2009-06-18 13:47:59.0" UUID="20c8f083-5870-4cbd-bf56-c5b2b98ab6a7" SORTINDEX="2" TREEINDEX="#t1#1#3#" COUNTCHILDREN="1" CLASSIFICATION_ID="1" PARENT_ID="1" TAXON_ID="36" EXCLUDED="FALSE" UNPLACED="FALSE"/>
-  <TAXONNODE ID="4" CREATED="2009-06-18 13:47:59.0" UUID="0b5846e5-b8d2-4ca9-ac51-099286ea4adc" SORTINDEX="0" TREEINDEX="#t1#1#3#4#" COUNTCHILDREN="0" CLASSIFICATION_ID="1" PARENT_ID="3" TAXON_ID="38" EXCLUDED="FALSE" UNPLACED="FALSE"/>
-  <TAXONNODE ID="5" CREATED="2009-06-18 13:47:59.0" UUID="4f73adcc-a535-4fbe-a97a-c05ee8b12191" SORTINDEX="3" TREEINDEX="#t1#1#5#" COUNTCHILDREN="0" CLASSIFICATION_ID="1" PARENT_ID="1" TAXON_ID="42" EXCLUDED="FALSE" UNPLACED="FALSE"/>
+  <TAXONNODE ID="1" CREATED="2009-06-18 13:47:59.0" UUID="cf0316c9-1963-4268-8c2e-8d833c460ac3" SORTINDEX="-1" TREEINDEX="#t1#1#" COUNTCHILDREN="4" CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
+  <TAXONNODE ID="2" CREATED="2009-06-18 13:47:59.0" UUID="770239f6-4fa8-496b-8738-fe8f7b2ad519" SORTINDEX="1" TREEINDEX="#t1#1#2#" COUNTCHILDREN="0" CLASSIFICATION_ID="1" PARENT_ID="1" TAXON_ID="37" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
+  <TAXONNODE ID="3" CREATED="2009-06-18 13:47:59.0" UUID="20c8f083-5870-4cbd-bf56-c5b2b98ab6a7" SORTINDEX="2" TREEINDEX="#t1#1#3#" COUNTCHILDREN="1" CLASSIFICATION_ID="1" PARENT_ID="1" TAXON_ID="36" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
+  <TAXONNODE ID="4" CREATED="2009-06-18 13:47:59.0" UUID="0b5846e5-b8d2-4ca9-ac51-099286ea4adc" SORTINDEX="0" TREEINDEX="#t1#1#3#4#" COUNTCHILDREN="0" CLASSIFICATION_ID="1" PARENT_ID="3" TAXON_ID="38" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
+  <TAXONNODE ID="5" CREATED="2009-06-18 13:47:59.0" UUID="4f73adcc-a535-4fbe-a97a-c05ee8b12191" SORTINDEX="3" TREEINDEX="#t1#1#5#" COUNTCHILDREN="0" CLASSIFICATION_ID="1" PARENT_ID="1" TAXON_ID="42" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
    <TAXONNODE UUID="58728644-1155-4520-98f7-309fdb62abd7" SORTINDEX="0" COUNTCHILDREN="0" CLASSIFICATION_ID="1" PARENT_ID="1"/>
  </dataset>
 \ No newline at end of file
diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.xml

index fb13ffcc000532eccdc5e1bae5b4410ca81bdb04..d931549bedfd5714e236fc2b4a37f653c5301eee 100644 (file)
--- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.xml
+++ b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.xml
@@ -34,11 +34,11 @@
    <TAXONBASE DTYPE="Taxon" ID="15"   NAME_ID="40" SEC_ID="2" UUID="d30de962-3da6-42d7-9797-8584b63bbec7" UPDATED="2008-12-10 09:56:07.253" TITLECACHE="Genus"                                                   PROTECTEDTITLECACHE="true" TAXONSTATUSUNKNOWN="false" DOUBTFUL="false" PUBLISH="true"  USENAMECACHE="false" CREATED="2008-12-10 09:56:07.0" />
    <TAXONBASE DTYPE="Taxon" ID="42"   NAME_ID="41" SEC_ID="2" UUID="4c9af5ff-a834-4886-9871-f4fd4bb7beb3" UPDATED="2014-03-20 09:56:07.253" TITLECACHE="Acherontia kohlbeckeri"                                  PROTECTEDTITLECACHE="true" TAXONSTATUSUNKNOWN="false" DOUBTFUL="false" PUBLISH="true"  USENAMECACHE="false" CREATED="2008-12-10 09:56:07.0" />
  
-  <TAXONNODE ID="3" TAXON_ID="36" UUID="20c8f083-5870-4cbd-bf56-c5b2b98ab6a7" COUNTCHILDREN="2" PARENT_ID="4" TREEINDEX="#t1#4#3#" SORTINDEX="0" CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="TRUE" CREATED="2009-06-18 13:47:59.0" />
-  <TAXONNODE ID="1" TAXON_ID="38" UUID="0b5846e5-b8d2-4ca9-ac51-099286ea4adc" COUNTCHILDREN="0" PARENT_ID="3" TREEINDEX="#t1#4#3#1#" SORTINDEX="0" CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE" CREATED="2009-06-18 13:47:59.0" />
-  <TAXONNODE ID="2" TAXON_ID="37" UUID="770239f6-4fa8-496b-8738-fe8f7b2ad519" COUNTCHILDREN="0" PARENT_ID="3" TREEINDEX="#t1#4#3#2#" SORTINDEX="1" CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE" CREATED="2009-06-18 13:47:59.0" />
-  <TAXONNODE ID="5" TAXON_ID="42" UUID="4f73adcc-a535-4fbe-a97a-c05ee8b12191" COUNTCHILDREN="1" PARENT_ID="2" TREEINDEX="#t1#4#3#2#1#" SORTINDEX="0" CLASSIFICATION_ID="1" EXCLUDED="TRUE" UNPLACED="FALSE" CREATED="2009-06-18 13:47:59.0" />
-  <TAXONNODE ID="4" TAXON_ID="[null]" UUID="cf0316c9-1963-4268-8c2e-8d833c460ac3" COUNTCHILDREN="1" PARENT_ID="[null]" TREEINDEX="#t1#4#" SORTINDEX="[null]" CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE" CREATED="2009-06-18 13:47:59.0" />
+  <TAXONNODE ID="3" TAXON_ID="36" UUID="20c8f083-5870-4cbd-bf56-c5b2b98ab6a7" COUNTCHILDREN="2" PARENT_ID="4" TREEINDEX="#t1#4#3#" SORTINDEX="0" CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="TRUE" DOUBTFUL="FALSE" CREATED="2009-06-18 13:47:59.0" />
+  <TAXONNODE ID="1" TAXON_ID="38" UUID="0b5846e5-b8d2-4ca9-ac51-099286ea4adc" COUNTCHILDREN="0" PARENT_ID="3" TREEINDEX="#t1#4#3#1#" SORTINDEX="0" CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATED="2009-06-18 13:47:59.0" />
+  <TAXONNODE ID="2" TAXON_ID="37" UUID="770239f6-4fa8-496b-8738-fe8f7b2ad519" COUNTCHILDREN="0" PARENT_ID="3" TREEINDEX="#t1#4#3#2#" SORTINDEX="1" CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATED="2009-06-18 13:47:59.0" />
+  <TAXONNODE ID="5" TAXON_ID="42" UUID="4f73adcc-a535-4fbe-a97a-c05ee8b12191" COUNTCHILDREN="1" PARENT_ID="2" TREEINDEX="#t1#4#3#2#1#" SORTINDEX="0" CLASSIFICATION_ID="1" EXCLUDED="TRUE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATED="2009-06-18 13:47:59.0" />
+  <TAXONNODE ID="4" TAXON_ID="[null]" UUID="cf0316c9-1963-4268-8c2e-8d833c460ac3" COUNTCHILDREN="1" PARENT_ID="[null]" TREEINDEX="#t1#4#" SORTINDEX="[null]" CLASSIFICATION_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATED="2009-06-18 13:47:59.0" />
    <TAXONNODE_EXCLUDEDNOTE TAXONNODE_ID="5" EXCLUDEDNOTE_ID="2" EXCLUDEDNOTE_MAPKEY_ID="1"/>  
    <TAXONNODE_EXCLUDEDNOTE TAXONNODE_ID="5" EXCLUDEDNOTE_ID="3" EXCLUDEDNOTE_MAPKEY_ID="2"/>  
   
diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/ClassificationServiceDeepTest.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/ClassificationServiceDeepTest.xml

index 0ab31f64394f15d94aece7d79feacffa27cbdc6c..db0481297c08879b1752a1e99bc42a081aa9b180 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/ClassificationServiceDeepTest.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/ClassificationServiceDeepTest.xml
@@ -2,15 +2,15 @@
  <dataset>
    <CLASSIFICATION ID="1" CREATED="2015-01-28 12:17:56.0" UUID="52b41b07-5500-43ae-82e6-ea2fd328c3d5" UPDATED="2015-01-28 12:17:56.485" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="New Classification" MICROREFERENCE="[null]" TIMEPERIOD_START="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_END="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" NAME_ID="1" REFERENCE_ID="[null]" ROOTNODE_ID="2"/>
    <LANGUAGESTRING ID="1" CREATED="2015-01-28 12:17:56.0" UUID="b45b52e7-52a1-4cdf-82ef-c011ce324d3a" UPDATED="2015-01-28 12:17:56.462" TEXT="New Classification" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" LANGUAGE_ID="406"/>
-  <TAXONNODE ID="1" CREATED="2015-01-28 12:17:56.0" UUID="0bc9976a-ab5a-4eeb-9d22-20ddbfc8b6b3" UPDATED="2015-01-28 12:17:56.461" SORTINDEX="0" TREEINDEX="#t1#2#1#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="1" PARENT_ID="2" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="4" EXCLUDED="FALSE" UNPLACED="FALSE"/>
-  <TAXONNODE ID="2" CREATED="2015-01-28 12:17:56.0" UUID="96bed6ff-09ea-4317-ace4-2e97be6ba09c" UPDATED="2015-01-28 12:17:56.462" SORTINDEX="-1" TREEINDEX="#t1#2#" COUNTCHILDREN="4" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="1" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]" EXCLUDED="FALSE" UNPLACED="FALSE"/>
-  <TAXONNODE ID="3" CREATED="2015-01-28 12:17:56.0" UUID="c3275c07-127d-4411-8878-f80d152542c5" UPDATED="2015-01-28 12:17:56.478" SORTINDEX="1" TREEINDEX="#t1#2#3#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="1" PARENT_ID="2" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE"/>
-  <TAXONNODE ID="4" CREATED="2015-01-28 12:17:56.0" UUID="887ccf7d-76e6-4a1b-8a10-98e1a41065cd" UPDATED="2015-01-28 12:17:56.478" SORTINDEX="2" TREEINDEX="#t1#2#4#" COUNTCHILDREN="3" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="1" PARENT_ID="2" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="2" EXCLUDED="FALSE" UNPLACED="FALSE"/>
-  <TAXONNODE ID="5" CREATED="2015-01-28 12:17:56.0" UUID="410524ee-c523-4583-b94d-b2ad974ab723" UPDATED="2015-01-28 12:17:56.478" SORTINDEX="3" TREEINDEX="#t1#2#5#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="1" PARENT_ID="2" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="3" EXCLUDED="FALSE" UNPLACED="FALSE"/>
-  <TAXONNODE ID="6" CREATED="2015-01-28 12:17:56.0" UUID="7fa3ddd8-b49f-4063-9f05-7021f7fa40d0" UPDATED="2015-01-28 12:17:56.479" SORTINDEX="0" TREEINDEX="#t1#2#1#6#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="1" PARENT_ID="1" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5" EXCLUDED="FALSE" UNPLACED="FALSE"/>
-  <TAXONNODE ID="7" CREATED="2015-01-28 12:17:56.0" UUID="9024c2a4-eb39-44bd-ad38-cae5c263a53f" UPDATED="2015-01-28 12:17:56.48" SORTINDEX="0" TREEINDEX="#t1#2#4#7#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="1" PARENT_ID="4" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="6" EXCLUDED="FALSE" UNPLACED="FALSE"/>
-  <TAXONNODE ID="8" CREATED="2015-01-28 12:17:56.0" UUID="d1eebdf3-962d-4efd-8ef4-6d3b02801aad" UPDATED="2015-01-28 12:17:56.482" SORTINDEX="1" TREEINDEX="#t1#2#4#8#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="1" PARENT_ID="4" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="7" EXCLUDED="FALSE" UNPLACED="FALSE"/>
-  <TAXONNODE ID="9" CREATED="2015-01-28 12:17:56.0" UUID="4fd62300-52f7-4c6d-b64e-e939484bb21c" UPDATED="2015-01-28 12:17:56.484" SORTINDEX="2" TREEINDEX="#t1#2#4#9#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="1" PARENT_ID="4" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="8" EXCLUDED="FALSE" UNPLACED="FALSE"/>
+  <TAXONNODE ID="1" CREATED="2015-01-28 12:17:56.0" UUID="0bc9976a-ab5a-4eeb-9d22-20ddbfc8b6b3" UPDATED="2015-01-28 12:17:56.461" SORTINDEX="0" TREEINDEX="#t1#2#1#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="1" PARENT_ID="2" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="4" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
+  <TAXONNODE ID="2" CREATED="2015-01-28 12:17:56.0" UUID="96bed6ff-09ea-4317-ace4-2e97be6ba09c" UPDATED="2015-01-28 12:17:56.462" SORTINDEX="-1" TREEINDEX="#t1#2#" COUNTCHILDREN="4" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="1" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
+  <TAXONNODE ID="3" CREATED="2015-01-28 12:17:56.0" UUID="c3275c07-127d-4411-8878-f80d152542c5" UPDATED="2015-01-28 12:17:56.478" SORTINDEX="1" TREEINDEX="#t1#2#3#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="1" PARENT_ID="2" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="1" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
+  <TAXONNODE ID="4" CREATED="2015-01-28 12:17:56.0" UUID="887ccf7d-76e6-4a1b-8a10-98e1a41065cd" UPDATED="2015-01-28 12:17:56.478" SORTINDEX="2" TREEINDEX="#t1#2#4#" COUNTCHILDREN="3" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="1" PARENT_ID="2" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="2" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
+  <TAXONNODE ID="5" CREATED="2015-01-28 12:17:56.0" UUID="410524ee-c523-4583-b94d-b2ad974ab723" UPDATED="2015-01-28 12:17:56.478" SORTINDEX="3" TREEINDEX="#t1#2#5#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="1" PARENT_ID="2" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="3" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
+  <TAXONNODE ID="6" CREATED="2015-01-28 12:17:56.0" UUID="7fa3ddd8-b49f-4063-9f05-7021f7fa40d0" UPDATED="2015-01-28 12:17:56.479" SORTINDEX="0" TREEINDEX="#t1#2#1#6#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="1" PARENT_ID="1" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
+  <TAXONNODE ID="7" CREATED="2015-01-28 12:17:56.0" UUID="9024c2a4-eb39-44bd-ad38-cae5c263a53f" UPDATED="2015-01-28 12:17:56.48" SORTINDEX="0" TREEINDEX="#t1#2#4#7#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="1" PARENT_ID="4" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="6" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
+  <TAXONNODE ID="8" CREATED="2015-01-28 12:17:56.0" UUID="d1eebdf3-962d-4efd-8ef4-6d3b02801aad" UPDATED="2015-01-28 12:17:56.482" SORTINDEX="1" TREEINDEX="#t1#2#4#8#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="1" PARENT_ID="4" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="7" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
+  <TAXONNODE ID="9" CREATED="2015-01-28 12:17:56.0" UUID="4fd62300-52f7-4c6d-b64e-e939484bb21c" UPDATED="2015-01-28 12:17:56.484" SORTINDEX="2" TREEINDEX="#t1#2#4#9#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="1" PARENT_ID="4" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="8" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE"/>
    <TAXONBASE DTYPE="Taxon" ID="1" CREATED="2015-01-28 12:17:56.0" UUID="e8bc5566-eca6-4814-b18a-814c16c66144" UPDATED="2015-01-28 12:17:56.463" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Griftus sec. ???" APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" NAME_ID="1" SEC_ID="[null]"/>
    <TAXONBASE DTYPE="Taxon" ID="2" CREATED="2015-01-28 12:17:56.0" UUID="c1cae3aa-960e-482f-b336-f3e657e96c43" UPDATED="2015-01-28 12:17:56.466" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Genus genus sec. ???" APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" NAME_ID="2" SEC_ID="[null]"/>
    <TAXONBASE DTYPE="Taxon" ID="3" CREATED="2015-01-28 12:17:56.0" UUID="15d719a2-d27d-4366-92de-0898b2f3ebc8" UPDATED="2015-01-28 12:17:56.468" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Griftus grifatus subsp. fikus sec. ???" APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" NAME_ID="3" SEC_ID="[null]"/>
diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/ClassificationServiceImplTest.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/ClassificationServiceImplTest.xml

index 646baf7877820a16e85c907b2480ed83a38e888c..6664b3a6860abe4f55af78079d30f967c7a44441 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/ClassificationServiceImplTest.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/ClassificationServiceImplTest.xml
@@ -18,15 +18,15 @@
    <TAXONNAME NAMETYPE="ICNAFP" ID="5007" CREATED="2015-09-03 10:40:10.0" UUID="3498c017-e8d1-43e0-9cb8-9edbdbe6f403" UPDATED="2015-09-03 10:40:10.851" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Acacia acicularis Willd." APPENDEDPHRASE="[null]" FULLTITLECACHE="Acacia acicularis Willd., Sp. Pl." NOMENCLATURALMICROREFERENCE="[null]" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="Willd." BINOMHYBRID="false" GENUSORUNINOMIAL="Acacia" HYBRIDFORMULA="false" INFRAGENERICEPITHET="[null]" INFRASPECIFICEPITHET="[null]" MONOMHYBRID="false" NAMECACHE="Acacia acicularis" PROTECTEDAUTHORSHIPCACHE="true" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="acicularis" TRINOMHYBRID="false" NAMEAPPROBATION="[null]" SUBGENUSAUTHORSHIP="[null]" ANAMORPHIC="false" CULTIVARNAME="[null]" ACRONYM="[null]" BREED="[null]" ORIGINALPUBLICATIONYEAR="[null]" PUBLICATIONYEAR="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" HOMOTYPICALGROUP_ID="5007" NOMENCLATURALREFERENCE_ID="5000" RANK_ID="765" BASIONYMAUTHORSHIP_ID="[null]" COMBINATIONAUTHORSHIP_ID="[null]" EXBASIONYMAUTHORSHIP_ID="[null]" EXCOMBINATIONAUTHORSHIP_ID="[null]"/>\r
    <REFERENCE ID="5000" CREATED="2015-09-03 10:40:10.0" UUID="d8db2b51-cb22-40ad-90e2-f66fa1306639" UPDATED="[null]" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="true" TITLECACHE="Sp. Pl." DATEPUBLISHED_END="[null]" DATEPUBLISHED_FREETEXT="[null]" DATEPUBLISHED_START="[null]" EDITION="[null]" EDITOR="[null]" ISBN="[null]" ISSN="[null]" DOI="[null]" NOMENCLATURALLYRELEVANT="false" ORGANIZATION="[null]" PAGES="[null]" PARSINGPROBLEM="0" PLACEPUBLISHED="[null]" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PUBLISHER="[null]" REFERENCEABSTRACT="[null]" SERIESPART="[null]" TITLE="[null]" ABBREVTITLE="[null]" ABBREVTITLECACHE="" PROTECTEDABBREVTITLECACHE="false" REFTYPE="BK" URI="[null]" VOLUME="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" AUTHORSHIP_ID="[null]" INREFERENCE_ID="[null]" INSTITUTION_ID="[null]" SCHOOL_ID="[null]"/>\r
    <CLASSIFICATION ID="5000" CREATED="2015-09-03 10:40:10.0" UUID="6c2bc8d9-ee62-4222-be89-4a8e31770878" UPDATED="[null]" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Acacia Classification" MICROREFERENCE="[null]" TIMEPERIOD_START="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_END="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" NAME_ID="5000" REFERENCE_ID="[null]" ROOTNODE_ID="5000"/>\r
-  <TAXONNODE ID="5000" CREATED="2015-09-03 10:40:10.0" UUID="6b4966ae-8815-49e5-849c-7001b29e5ed0" UPDATED="2015-09-03 10:40:10.8" SORTINDEX="-1" TREEINDEX="#t5000#5000#" COUNTCHILDREN="2" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>\r
-  <TAXONNODE ID="5001" CREATED="2015-09-03 10:40:10.0" UUID="26cc5c08-72df-45d4-84ea-ce81e7e53114" UPDATED="2015-09-03 10:40:10.827" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="4" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>\r
-  <TAXONNODE ID="5002" CREATED="2015-09-03 10:40:10.0" UUID="65f23459-be2c-4cad-9408-9b3c4a80ecb8" UPDATED="2015-09-03 10:40:10.831" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5002#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5001" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>\r
-  <TAXONNODE ID="5003" CREATED="2015-09-03 10:40:10.0" UUID="0ac5ae92-538f-4af5-bdf7-b44dd8b74d24" UPDATED="2015-09-03 10:40:10.836" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5002#5003#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5002" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5002"/>\r
-  <TAXONNODE ID="5004" CREATED="2015-09-03 10:40:10.0" UUID="47ba200d-b6ab-49d2-8f29-fe467c21c4e6" UPDATED="2015-09-03 10:40:10.839" SORTINDEX="1" TREEINDEX="#t5000#5000#5001#5004#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5001" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5003"/>\r
-  <TAXONNODE ID="5005" CREATED="2015-09-03 10:40:10.0" UUID="6d13b1f4-de14-48a0-a9c7-12623339475e" UPDATED="2015-09-03 10:40:10.842" SORTINDEX="2" TREEINDEX="#t5000#5000#5001#5005#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5001" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5004"/>\r
-  <TAXONNODE ID="5006" CREATED="2015-09-03 10:40:10.0" UUID="48021a9c-a3b3-426c-8fbb-0054f9c6c162" UPDATED="2015-09-03 10:40:10.845" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5005#5006#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5005" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5005"/>\r
-  <TAXONNODE ID="5007" CREATED="2015-09-03 10:40:10.0" UUID="59ae3ba6-a0a6-43af-9809-5a311d5cbd5f" UPDATED="2015-09-03 10:40:10.847" SORTINDEX="3" TREEINDEX="#t5000#5000#5001#5007#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5001" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5006"/>\r
-  <TAXONNODE ID="5008" CREATED="2015-09-03 10:40:10.0" UUID="fdc56219-0005-4ca9-843b-90405688024d" UPDATED="2015-09-03 10:40:10.85" SORTINDEX="1" TREEINDEX="#t5000#5000#5008#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5007"/>\r
+  <TAXONNODE ID="5000" CREATED="2015-09-03 10:40:10.0" UUID="6b4966ae-8815-49e5-849c-7001b29e5ed0" UPDATED="2015-09-03 10:40:10.8" SORTINDEX="-1" TREEINDEX="#t5000#5000#" COUNTCHILDREN="2" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>\r
+  <TAXONNODE ID="5001" CREATED="2015-09-03 10:40:10.0" UUID="26cc5c08-72df-45d4-84ea-ce81e7e53114" UPDATED="2015-09-03 10:40:10.827" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="4" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>\r
+  <TAXONNODE ID="5002" CREATED="2015-09-03 10:40:10.0" UUID="65f23459-be2c-4cad-9408-9b3c4a80ecb8" UPDATED="2015-09-03 10:40:10.831" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5002#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5001" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>\r
+  <TAXONNODE ID="5003" CREATED="2015-09-03 10:40:10.0" UUID="0ac5ae92-538f-4af5-bdf7-b44dd8b74d24" UPDATED="2015-09-03 10:40:10.836" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5002#5003#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5002" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5002"/>\r
+  <TAXONNODE ID="5004" CREATED="2015-09-03 10:40:10.0" UUID="47ba200d-b6ab-49d2-8f29-fe467c21c4e6" UPDATED="2015-09-03 10:40:10.839" SORTINDEX="1" TREEINDEX="#t5000#5000#5001#5004#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5001" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5003"/>\r
+  <TAXONNODE ID="5005" CREATED="2015-09-03 10:40:10.0" UUID="6d13b1f4-de14-48a0-a9c7-12623339475e" UPDATED="2015-09-03 10:40:10.842" SORTINDEX="2" TREEINDEX="#t5000#5000#5001#5005#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5001" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5004"/>\r
+  <TAXONNODE ID="5006" CREATED="2015-09-03 10:40:10.0" UUID="48021a9c-a3b3-426c-8fbb-0054f9c6c162" UPDATED="2015-09-03 10:40:10.845" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5005#5006#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5005" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5005"/>\r
+  <TAXONNODE ID="5007" CREATED="2015-09-03 10:40:10.0" UUID="59ae3ba6-a0a6-43af-9809-5a311d5cbd5f" UPDATED="2015-09-03 10:40:10.847" SORTINDEX="3" TREEINDEX="#t5000#5000#5001#5007#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5001" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5006"/>\r
+  <TAXONNODE ID="5008" CREATED="2015-09-03 10:40:10.0" UUID="fdc56219-0005-4ca9-843b-90405688024d" UPDATED="2015-09-03 10:40:10.85" SORTINDEX="1" TREEINDEX="#t5000#5000#5008#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5007"/>\r
    <LANGUAGESTRING ID="5000" CREATED="2015-09-03 10:40:10.0" UUID="70422fe3-a01d-4780-b9f4-4b807177f6bb" UPDATED="2015-09-03 10:40:10.798" TEXT="Acacia Classification" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" LANGUAGE_ID="406"/>\r
    <HOMOTYPICALGROUP ID="5000" CREATED="2015-09-03 10:40:10.0" UUID="93799212-6c6b-4b68-8367-d54194750539" UPDATED="2015-09-03 10:40:10.83" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]"/>\r
    <HOMOTYPICALGROUP ID="5001" CREATED="2015-09-03 10:40:10.0" UUID="3685196d-730c-4c7e-90b7-19c322543988" UPDATED="2015-09-03 10:40:10.834" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]"/>\r
diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.testFindByIdentifierOrMarker.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.testFindByIdentifierOrMarker.xml

index cb57f9a38937168a5cfc74f7b6f9e3e4a4666df3..7c4539d374e383c19fd424d80429f712dcf81e2a 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.testFindByIdentifierOrMarker.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.testFindByIdentifierOrMarker.xml
@@ -32,8 +32,8 @@
    <TAXONNAME_MARKER TAXONNAME_ID="5000" MARKERS_ID="5000"/>
    
    <CLASSIFICATION ID="5000" CREATED="2015-01-07 21:54:20.0" UUID="277ac532-b670-4a1b-927a-61063ecfeb5b" UPDATED="2015-01-07 21:54:20.76" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="true" TITLECACHE="My classification" MICROREFERENCE="[null]" TIMEPERIOD_START="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_END="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" NAME_ID="[null]" REFERENCE_ID="[null]" ROOTNODE_ID="5000"/>
-  <TAXONNODE ID="5000" CREATED="2015-01-07 21:54:20.0" UUID="cf00cde1-efc8-4d3b-8c5c-71c3d6e692d9" UPDATED="2015-01-07 21:54:20.76" SORTINDEX="-1" EXCLUDED="false" UNPLACED="false" TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
-  <TAXONNODE ID="5001" CREATED="2015-01-07 21:54:20.0" UUID="73d8ece1-c511-48b7-9a1f-f6fab3149bf1" UPDATED="2015-01-07 21:54:20.76" SORTINDEX="0" EXCLUDED="false" UNPLACED="false" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
+  <TAXONNODE ID="5000" CREATED="2015-01-07 21:54:20.0" UUID="cf00cde1-efc8-4d3b-8c5c-71c3d6e692d9" UPDATED="2015-01-07 21:54:20.76" SORTINDEX="-1" EXCLUDED="false" UNPLACED="FALSE" DOUBTFUL="FALSE" TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
+  <TAXONNODE ID="5001" CREATED="2015-01-07 21:54:20.0" UUID="73d8ece1-c511-48b7-9a1f-f6fab3149bf1" UPDATED="2015-01-07 21:54:20.76" SORTINDEX="0" EXCLUDED="false" UNPLACED="FALSE" DOUBTFUL="FALSE" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
    <HOMOTYPICALGROUP ID="5000" CREATED="2015-01-07 21:54:20.0" UUID="599e8459-4302-47d5-aa0b-9b69a0f329e4" UPDATED="2015-01-07 21:54:20.76" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]"/>  
    <REFERENCE ID="1" 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" PROTECTEDABBREVTITLECACHE="false" ABBREVTITLECACHE="Sp. Pl." ABBREVTITLE="Sp. Pl." NOMENCLATURALLYRELEVANT="false" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1"/>
    <REFERENCE ID="2" 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" PROTECTEDABBREVTITLECACHE="false" ABBREVTITLECACHE="Sp. Pl." ABBREVTITLE="Sp. Pl." NOMENCLATURALLYRELEVANT="true" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1"/>
diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest-testAllKindsOfSpecimenAssociations.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest-testAllKindsOfSpecimenAssociations.xml

index abe4dec112ddd7686fed4cf6158c86acca672fed..d970877f7881b1bbcfaf9b2e708116c37f827a0e 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest-testAllKindsOfSpecimenAssociations.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest-testAllKindsOfSpecimenAssociations.xml
@@ -12,8 +12,8 @@
    <DESCRIPTIONBASE DTYPE="TaxonDescription" ID="5000" CREATED="2018-04-25 11:57:40.0" UUID="e94ecb2d-b26f-4223-9349-131ec1ea220f" UPDATED="[null]" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Factual data for Campanula patual" IMAGEGALLERY="false" ISDEFAULT="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" SPECIMEN_ID="[null]" TAXON_ID="5000" TAXONNAME_ID="[null]"/>
    <TAXONBASE DTYPE="Taxon" ID="5000" CREATED="2018-04-25 11:57:40.0" UUID="07cc47a5-1a63-46a1-8366-0d59d2b90d5b" UPDATED="[null]" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" SECMICROREFERENCE="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Campanula patual sec. ???" APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" EXCLUDED="[null]" TAXONSTATUSUNKNOWN="false" UNPLACED="[null]" PARTIAL="[null]" PROPARTE="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" NAME_ID="5000" SEC_ID="[null]" ACCEPTEDTAXON_ID="[null]" TYPE_ID="[null]"/>
    <TAXONBASE DTYPE="Synonym" ID="5001" CREATED="2018-04-25 11:57:40.0" UUID="c16bcd9b-7d18-4fb5-af60-f9ef14c1d3a9" UPDATED="[null]" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" SECMICROREFERENCE="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Syno nyma syn. sec. ???" APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" EXCLUDED="[null]" TAXONSTATUSUNKNOWN="[null]" UNPLACED="[null]" PARTIAL="false" PROPARTE="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" NAME_ID="5001" SEC_ID="[null]" ACCEPTEDTAXON_ID="5000" TYPE_ID="847"/>
-  <TAXONNODE ID="5000" CREATED="2018-04-25 11:57:40.0" UUID="d5a9525b-3398-463d-bbbd-de1976ba9bdc" UPDATED="2018-04-25 11:57:40.417" SORTINDEX="-1" TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
-  <TAXONNODE ID="5001" CREATED="2018-04-25 11:57:40.0" UUID="6b8b6ff9-66e4-4496-8e5a-7d03bdf9a076" UPDATED="2018-04-25 11:57:40.417" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
+  <TAXONNODE ID="5000" CREATED="2018-04-25 11:57:40.0" UUID="d5a9525b-3398-463d-bbbd-de1976ba9bdc" UPDATED="2018-04-25 11:57:40.417" SORTINDEX="-1" TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
+  <TAXONNODE ID="5001" CREATED="2018-04-25 11:57:40.0" UUID="6b8b6ff9-66e4-4496-8e5a-7d03bdf9a076" UPDATED="2018-04-25 11:57:40.417" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
    <CLASSIFICATION ID="5000" CREATED="2018-04-25 11:57:40.0" UUID="5854bb37-13f3-48e7-891e-dc8c82f355df" UPDATED="[null]" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Test Classification" MICROREFERENCE="[null]" TIMEPERIOD_START="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_END="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" NAME_ID="5000" REFERENCE_ID="[null]" ROOTNODE_ID="5000"/>
    <TYPEDESIGNATIONBASE DTYPE="SpecimenTypeDesignation" ID="5000" CREATED="2018-04-25 11:57:40.0" UUID="33315177-2a71-4369-b020-fece07a8cc04" UPDATED="[null]" CITATIONMICROREFERENCE="[null]" ORIGINALNAMESTRING="[null]" NOTDESIGNATED="false" CONSERVEDTYPE="[null]" REJECTEDTYPE="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CITATION_ID="[null]" TYPESTATUS_ID="[null]" TYPENAME_ID="[null]" TYPESPECIMEN_ID="5007"/>
    <TAXONNAME ID="5000" CREATED="2018-04-25 11:57:40.0" UUID="e59b95c0-9ad6-48be-af62-a982ba72b917" UPDATED="[null]" NAMETYPE="ICNAFP" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Campanula patual" APPENDEDPHRASE="[null]" FULLTITLECACHE="Campanula patual" NOMENCLATURALMICROREFERENCE="[null]" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" BINOMHYBRID="false" GENUSORUNINOMIAL="Campanula" HYBRIDFORMULA="false" INFRAGENERICEPITHET="[null]" INFRASPECIFICEPITHET="[null]" MONOMHYBRID="false" NAMECACHE="Campanula patual" PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="patual" TRINOMHYBRID="false" NAMEAPPROBATION="[null]" SUBGENUSAUTHORSHIP="[null]" ANAMORPHIC="false" CULTIVARNAME="[null]" ACRONYM="[null]" BREED="[null]" ORIGINALPUBLICATIONYEAR="[null]" PUBLICATIONYEAR="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" HOMOTYPICALGROUP_ID="5000" NOMENCLATURALREFERENCE_ID="[null]" RANK_ID="765" BASIONYMAUTHORSHIP_ID="[null]" COMBINATIONAUTHORSHIP_ID="[null]" EXBASIONYMAUTHORSHIP_ID="[null]" EXCOMBINATIONAUTHORSHIP_ID="[null]"/>
diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/SecurityTest.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/SecurityTest.xml

index 3704392cadfc18edfaccd082c03060d616aa6fec..0c7796e5ae710c5af6f967adb77d5a0d00e8892e 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/SecurityTest.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/SecurityTest.xml
@@ -141,11 +141,11 @@
      GENUSORUNINOMIAL="[null]" SPECIFICEPITHET="[null]"
      NOMENCLATURALREFERENCE_ID="1" HOMOTYPICALGROUP_ID="4" />
  
-  <TAXONNODE ID="1" CREATED="2009-06-18 13:47:59.0" UUID="f197b511-8a9f-4fc7-8dc8-b068fd898852" COUNTCHILDREN="0" EXCLUDED="FALSE" UNPLACED="FALSE" TAXON_ID="[null]" PARENT_ID="[null]" SORTINDEX="[null]" CLASSIFICATION_ID="1" TREEINDEX="#t1#1#"/>
-  <TAXONNODE ID="2" CREATED="2009-06-18 13:47:59.0" UUID="0b5846e5-b8d2-4ca9-ac51-099286ea4adc" COUNTCHILDREN="0" EXCLUDED="FALSE" UNPLACED="FALSE" TAXON_ID="38" PARENT_ID="3" SORTINDEX="0" CLASSIFICATION_ID="1" TREEINDEX="#t1#1#5#4#3#2#"/>
-  <TAXONNODE ID="3" CREATED="2009-06-18 13:47:59.0" UUID="770239f6-4fa8-496b-8738-fe8f7b2ad519" COUNTCHILDREN="0" EXCLUDED="FALSE" UNPLACED="FALSE" TAXON_ID="37" PARENT_ID="4" SORTINDEX="0" CLASSIFICATION_ID="1" TREEINDEX="#t1#1#5#4#3#"/>
-  <TAXONNODE ID="4" CREATED="2009-06-18 13:47:59.0" UUID="20c8f083-5870-4cbd-bf56-c5b2b98ab6a7" COUNTCHILDREN="2" EXCLUDED="FALSE" UNPLACED="FALSE" TAXON_ID="36" PARENT_ID="5" SORTINDEX="0" CLASSIFICATION_ID="1" TREEINDEX="#t1#1#5#4#"/>
-  <TAXONNODE ID="5" CREATED="2009-06-18 13:47:59.0" UUID="cecfa77f-f26a-4476-9d87-a8d993cb55d9" COUNTCHILDREN="1" EXCLUDED="FALSE" UNPLACED="FALSE" TAXON_ID="41" PARENT_ID="1" SORTINDEX="0" CLASSIFICATION_ID="1" TREEINDEX="#t1#1#5#"/>
+  <TAXONNODE ID="1" CREATED="2009-06-18 13:47:59.0" UUID="f197b511-8a9f-4fc7-8dc8-b068fd898852" COUNTCHILDREN="0" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" TAXON_ID="[null]" PARENT_ID="[null]" SORTINDEX="[null]" CLASSIFICATION_ID="1" TREEINDEX="#t1#1#"/>
+  <TAXONNODE ID="2" CREATED="2009-06-18 13:47:59.0" UUID="0b5846e5-b8d2-4ca9-ac51-099286ea4adc" COUNTCHILDREN="0" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" TAXON_ID="38" PARENT_ID="3" SORTINDEX="0" CLASSIFICATION_ID="1" TREEINDEX="#t1#1#5#4#3#2#"/>
+  <TAXONNODE ID="3" CREATED="2009-06-18 13:47:59.0" UUID="770239f6-4fa8-496b-8738-fe8f7b2ad519" COUNTCHILDREN="0" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" TAXON_ID="37" PARENT_ID="4" SORTINDEX="0" CLASSIFICATION_ID="1" TREEINDEX="#t1#1#5#4#3#"/>
+  <TAXONNODE ID="4" CREATED="2009-06-18 13:47:59.0" UUID="20c8f083-5870-4cbd-bf56-c5b2b98ab6a7" COUNTCHILDREN="2" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" TAXON_ID="36" PARENT_ID="5" SORTINDEX="0" CLASSIFICATION_ID="1" TREEINDEX="#t1#1#5#4#"/>
+  <TAXONNODE ID="5" CREATED="2009-06-18 13:47:59.0" UUID="cecfa77f-f26a-4476-9d87-a8d993cb55d9" COUNTCHILDREN="1" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" TAXON_ID="41" PARENT_ID="1" SORTINDEX="0" CLASSIFICATION_ID="1" TREEINDEX="#t1#1#5#"/>
  
    <CLASSIFICATION ID="1" CREATED="2009-06-18 13:47:59.0" UUID="aeee7448-5298-4991-b724-8d5b75a0a7a9" PROTECTEDTITLECACHE="false" TITLECACHE="TestBaum" NAME_ID="1" ROOTNODE_ID="1"/>
    <CLASSIFICATION_AUD ID="1" REV="1025" REVTYPE="0" CREATED="2009-06-18 13:47:59.0" UUID="aeee7448-5298-4991-b724-8d5b75a0a7a9" PROTECTEDTITLECACHE="false" TITLECACHE="TestBaum" NAME_ID="1" ROOTNODE_ID="1"/>
diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/StatisticsServiceImplTest2.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/StatisticsServiceImplTest2.xml

index e026f41f0e59bd033e43f1e82cefe751a710c86d..5b088bd5564710c4a5f937b5334febf1522feaf7 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/StatisticsServiceImplTest2.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/StatisticsServiceImplTest2.xml
@@ -151,20 +151,20 @@
    <CLASSIFICATION_TAXONNODE CLASSIFICATION_ID="5002" ROOTNODES_ID="5011" SORTINDEX="0"/>
    <CLASSIFICATION_TAXONNODE CLASSIFICATION_ID="5002" ROOTNODES_ID="5012" SORTINDEX="1"/>
    <CLASSIFICATION_TAXONNODE CLASSIFICATION_ID="5002" ROOTNODES_ID="5013" SORTINDEX="2"/>-->
-  <TAXONNODE ID="5000" CREATED="2013-10-31 20:42:25.0" UUID="be386230-ee0d-4c2a-9c3d-6e240fda0bc0" UPDATED="2013-10-31 20:42:25.842" SORTINDEX="0" TREEINDEX="#t5000#5000#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>
-  <TAXONNODE ID="5001" CREATED="2013-10-31 20:42:25.0" UUID="87910dc8-8c14-446a-99d4-51ff6cd42bb4" UPDATED="2013-10-31 20:42:25.843" SORTINDEX="0" TREEINDEX="#t5001#5001#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>
-  <TAXONNODE ID="5002" CREATED="2013-10-31 20:42:25.0" UUID="47cfaf6f-bd85-4bbd-a52e-c0ba45f4e226" UPDATED="2013-10-31 20:42:25.856" SORTINDEX="1" TREEINDEX="#t5000#5002#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5003"/>
-  <TAXONNODE ID="5003" CREATED="2013-10-31 20:42:25.0" UUID="ef8dfc02-6833-4da1-bd2e-42bffe437141" UPDATED="2013-10-31 20:42:25.856" SORTINDEX="1" TREEINDEX="#t5001#5003#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5003"/>
-  <TAXONNODE ID="5004" CREATED="2013-10-31 20:42:25.0" UUID="d6dc4747-2b01-4590-87c5-280ab3a64b36" UPDATED="2013-10-31 20:42:25.868" SORTINDEX="2" TREEINDEX="#t5001#5004#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5005"/>
-  <TAXONNODE ID="5005" CREATED="2013-10-31 20:42:25.0" UUID="d5517660-0aaa-42de-b579-c1c2cb8b992f" UPDATED="2013-10-31 20:42:25.868" SORTINDEX="2" TREEINDEX="#t5000#5005#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5005"/>
-  <TAXONNODE ID="5006" CREATED="2013-10-31 20:42:25.0" UUID="221bc288-466e-4317-a783-0a15c008b837" UPDATED="2013-10-31 20:42:25.873" SORTINDEX="3" TREEINDEX="#t5001#5006#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5007"/>
-  <TAXONNODE ID="5007" CREATED="2013-10-31 20:42:25.0" UUID="a83ab208-334c-4ed7-8174-352daaf02820" UPDATED="2013-10-31 20:42:25.874" SORTINDEX="3" TREEINDEX="#t5000#5007#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5007"/>
-  <TAXONNODE ID="5008" CREATED="2013-10-31 20:42:25.0" UUID="46936311-c170-4dea-ba07-d14656f94dad" UPDATED="2013-10-31 20:42:25.88" SORTINDEX="4" TREEINDEX="#t5000#5008#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5009"/>
-  <TAXONNODE ID="5009" CREATED="2013-10-31 20:42:25.0" UUID="b2e8b073-6608-4a0b-9805-a8180137bc42" UPDATED="2013-10-31 20:42:25.885" SORTINDEX="4" TREEINDEX="#t5001#5009#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5011"/>
-  <TAXONNODE ID="5010" CREATED="2013-10-31 20:42:25.0" UUID="2fb16069-49c8-4c9c-be2d-648b50218676" UPDATED="2013-10-31 20:42:25.89" SORTINDEX="5" TREEINDEX="#t5001#5010#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5013"/>
-  <TAXONNODE ID="5011" CREATED="2013-10-31 20:42:25.0" UUID="e1b8cf42-e5c9-4c73-a5d5-5c12b7fd6639" UPDATED="2013-10-31 20:42:25.892" SORTINDEX="0" TREEINDEX="#t5002#5011#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5002" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5014"/>
-  <TAXONNODE ID="5012" CREATED="2013-10-31 20:42:25.0" UUID="1bad66fa-748e-4dee-9bbe-fecc43749c04" UPDATED="2013-10-31 20:42:25.895" SORTINDEX="1" TREEINDEX="#t5002#5012#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5002" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5015"/>
-  <TAXONNODE ID="5013" CREATED="2013-10-31 20:42:25.0" UUID="da948f9a-ddb8-4193-bba7-f51df3760cbc" UPDATED="2013-10-31 20:42:25.897" SORTINDEX="2" TREEINDEX="#t5002#5013#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5002" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5016"/>
+  <TAXONNODE ID="5000" CREATED="2013-10-31 20:42:25.0" UUID="be386230-ee0d-4c2a-9c3d-6e240fda0bc0" UPDATED="2013-10-31 20:42:25.842" SORTINDEX="0" TREEINDEX="#t5000#5000#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>
+  <TAXONNODE ID="5001" CREATED="2013-10-31 20:42:25.0" UUID="87910dc8-8c14-446a-99d4-51ff6cd42bb4" UPDATED="2013-10-31 20:42:25.843" SORTINDEX="0" TREEINDEX="#t5001#5001#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>
+  <TAXONNODE ID="5002" CREATED="2013-10-31 20:42:25.0" UUID="47cfaf6f-bd85-4bbd-a52e-c0ba45f4e226" UPDATED="2013-10-31 20:42:25.856" SORTINDEX="1" TREEINDEX="#t5000#5002#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5003"/>
+  <TAXONNODE ID="5003" CREATED="2013-10-31 20:42:25.0" UUID="ef8dfc02-6833-4da1-bd2e-42bffe437141" UPDATED="2013-10-31 20:42:25.856" SORTINDEX="1" TREEINDEX="#t5001#5003#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5003"/>
+  <TAXONNODE ID="5004" CREATED="2013-10-31 20:42:25.0" UUID="d6dc4747-2b01-4590-87c5-280ab3a64b36" UPDATED="2013-10-31 20:42:25.868" SORTINDEX="2" TREEINDEX="#t5001#5004#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5005"/>
+  <TAXONNODE ID="5005" CREATED="2013-10-31 20:42:25.0" UUID="d5517660-0aaa-42de-b579-c1c2cb8b992f" UPDATED="2013-10-31 20:42:25.868" SORTINDEX="2" TREEINDEX="#t5000#5005#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5005"/>
+  <TAXONNODE ID="5006" CREATED="2013-10-31 20:42:25.0" UUID="221bc288-466e-4317-a783-0a15c008b837" UPDATED="2013-10-31 20:42:25.873" SORTINDEX="3" TREEINDEX="#t5001#5006#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5007"/>
+  <TAXONNODE ID="5007" CREATED="2013-10-31 20:42:25.0" UUID="a83ab208-334c-4ed7-8174-352daaf02820" UPDATED="2013-10-31 20:42:25.874" SORTINDEX="3" TREEINDEX="#t5000#5007#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5007"/>
+  <TAXONNODE ID="5008" CREATED="2013-10-31 20:42:25.0" UUID="46936311-c170-4dea-ba07-d14656f94dad" UPDATED="2013-10-31 20:42:25.88" SORTINDEX="4" TREEINDEX="#t5000#5008#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5009"/>
+  <TAXONNODE ID="5009" CREATED="2013-10-31 20:42:25.0" UUID="b2e8b073-6608-4a0b-9805-a8180137bc42" UPDATED="2013-10-31 20:42:25.885" SORTINDEX="4" TREEINDEX="#t5001#5009#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5011"/>
+  <TAXONNODE ID="5010" CREATED="2013-10-31 20:42:25.0" UUID="2fb16069-49c8-4c9c-be2d-648b50218676" UPDATED="2013-10-31 20:42:25.89" SORTINDEX="5" TREEINDEX="#t5001#5010#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5013"/>
+  <TAXONNODE ID="5011" CREATED="2013-10-31 20:42:25.0" UUID="e1b8cf42-e5c9-4c73-a5d5-5c12b7fd6639" UPDATED="2013-10-31 20:42:25.892" SORTINDEX="0" TREEINDEX="#t5002#5011#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5002" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5014"/>
+  <TAXONNODE ID="5012" CREATED="2013-10-31 20:42:25.0" UUID="1bad66fa-748e-4dee-9bbe-fecc43749c04" UPDATED="2013-10-31 20:42:25.895" SORTINDEX="1" TREEINDEX="#t5002#5012#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5002" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5015"/>
+  <TAXONNODE ID="5013" CREATED="2013-10-31 20:42:25.0" UUID="da948f9a-ddb8-4193-bba7-f51df3760cbc" UPDATED="2013-10-31 20:42:25.897" SORTINDEX="2" TREEINDEX="#t5002#5013#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5002" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5016"/>
    <HIBERNATE_SEQUENCES SEQUENCE_NAME="CdmMetaData" NEXT_VAL="5003"/>
    <HIBERNATE_SEQUENCES SEQUENCE_NAME="Classification" NEXT_VAL="5003"/>
    <HIBERNATE_SEQUENCES SEQUENCE_NAME="DescriptionBase" NEXT_VAL="5008"/>
diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest-indexing.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest-indexing.xml

index 71b224b55ab81e49a4aa4eae4b9150247033eadf..ebeecff52089056455eb2117b9dd9d4ffacbdded 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest-indexing.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest-indexing.xml
@@ -3,14 +3,14 @@
      <CLASSIFICATION ID="1" UUID="6c2bc8d9-ee62-4222-be89-4a8e31770878"  PROTECTEDTITLECACHE="true" ROOTNODE_ID="1"/>
      <CLASSIFICATION ID="2" UUID="43d67247-936f-42a3-a739-bbcde372e334"  PROTECTEDTITLECACHE="true" ROOTNODE_ID="8"/>
  
-       <TAXONNODE ID="1" TAXON_ID="[null]" PARENT_ID="[null]" TREEINDEX="#t1#1#" SORTINDEX="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="1" UUID="f0682c6f-0652-4464-89c7-c0f7d6464274" COUNTCHILDREN="2"/>
-    <TAXONNODE ID="2" TAXON_ID="1" PARENT_ID="1" TREEINDEX="#t1#1#2#" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="1" UUID="484a1a77-689c-44be-8e65-347d835f47e8"  COUNTCHILDREN="2"/>
-    <TAXONNODE ID="3" TAXON_ID="2" PARENT_ID="1" TREEINDEX="#t1#1#3#" SORTINDEX="1" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="1" UUID="2d41f0c2-b785-4f73-a436-cc2d5e93cc5b"  COUNTCHILDREN="0"/>
-    <TAXONNODE ID="4" TAXON_ID="2" PARENT_ID="2" TREEINDEX="#t1#1#2#4#" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="1" UUID="2fbf7bf5-22dd-4c1a-84e4-c8c93d1f0342"  COUNTCHILDREN="1"/>
-    <TAXONNODE ID="5" TAXON_ID="2" PARENT_ID="2" TREEINDEX="#t1#1#2#5#" SORTINDEX="1" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="1" UUID="c4d5170a-7967-4dac-ab76-ae2019eefde5"  COUNTCHILDREN="0"/>
-    <TAXONNODE ID="6" TAXON_ID="2" PARENT_ID="4" TREEINDEX="#t1#1#2#4#6#" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="1" UUID="b419ba5e-9c8b-449c-ad86-7abfca9a7340"  COUNTCHILDREN="0"/>
-    <TAXONNODE ID="8" TAXON_ID="[null]" PARENT_ID="[null]" TREEINDEX="#t2#8#" SORTINDEX="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="2" UUID="324a1a77-689c-44be-8e65-347d835f4111" COUNTCHILDREN="1"/>
-    <TAXONNODE ID="7" TAXON_ID="2" PARENT_ID="8" TREEINDEX="#t2#8#7#" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="2" UUID="bb2c2d69-2b36-4f21-9374-b375ada8448c"  COUNTCHILDREN="0"/>
+       <TAXONNODE ID="1" TAXON_ID="[null]" PARENT_ID="[null]" TREEINDEX="#t1#1#" SORTINDEX="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="1" UUID="f0682c6f-0652-4464-89c7-c0f7d6464274" COUNTCHILDREN="2"/>
+    <TAXONNODE ID="2" TAXON_ID="1" PARENT_ID="1" TREEINDEX="#t1#1#2#" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="1" UUID="484a1a77-689c-44be-8e65-347d835f47e8"  COUNTCHILDREN="2"/>
+    <TAXONNODE ID="3" TAXON_ID="2" PARENT_ID="1" TREEINDEX="#t1#1#3#" SORTINDEX="1" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="1" UUID="2d41f0c2-b785-4f73-a436-cc2d5e93cc5b"  COUNTCHILDREN="0"/>
+    <TAXONNODE ID="4" TAXON_ID="2" PARENT_ID="2" TREEINDEX="#t1#1#2#4#" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="1" UUID="2fbf7bf5-22dd-4c1a-84e4-c8c93d1f0342"  COUNTCHILDREN="1"/>
+    <TAXONNODE ID="5" TAXON_ID="2" PARENT_ID="2" TREEINDEX="#t1#1#2#5#" SORTINDEX="1" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="1" UUID="c4d5170a-7967-4dac-ab76-ae2019eefde5"  COUNTCHILDREN="0"/>
+    <TAXONNODE ID="6" TAXON_ID="2" PARENT_ID="4" TREEINDEX="#t1#1#2#4#6#" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="1" UUID="b419ba5e-9c8b-449c-ad86-7abfca9a7340"  COUNTCHILDREN="0"/>
+    <TAXONNODE ID="8" TAXON_ID="[null]" PARENT_ID="[null]" TREEINDEX="#t2#8#" SORTINDEX="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="2" UUID="324a1a77-689c-44be-8e65-347d835f4111" COUNTCHILDREN="1"/>
+    <TAXONNODE ID="7" TAXON_ID="2" PARENT_ID="8" TREEINDEX="#t2#8#7#" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="2" UUID="bb2c2d69-2b36-4f21-9374-b375ada8448c"  COUNTCHILDREN="0"/>
  
      <TAXONBASE DTYPE="Taxon" ID="1" NAME_ID="[null]" UUID="55c3e41a-c629-40e6-aa6a-ff274ac6ddb1"       PROTECTEDTITLECACHE="false" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false"/>
      <TAXONBASE DTYPE="Taxon" ID="2"  NAME_ID="[null]" UUID="2659a7e0-ff35-4ee4-8493-b453756ab955"      PROTECTEDTITLECACHE="false" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false"/>
diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest-testFindCommonParentNode.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest-testFindCommonParentNode.xml

index 65713f177a934cc8a879495033d7bb68104bdbaa..48b52c4c9d3359049e063dd819214be9bfa4efda 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest-testFindCommonParentNode.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest-testFindCommonParentNode.xml
@@ -23,15 +23,15 @@
    <HOMOTYPICALGROUP ID="5006" CREATED="2018-06-26 09:03:54.0" UUID="c1e131a7-7f6f-4d83-99a0-97bf709bf13b" UPDATED="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]"/>
    <CLASSIFICATION ID="5000" CREATED="2018-06-26 09:03:54.0" UUID="c6e3a598-3b6c-4ef5-8b01-5bdb3de5a9fd" UPDATED="2018-06-26 09:03:54.906" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Checklist2" MICROREFERENCE="[null]" TIMEPERIOD_START="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_END="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" NAME_ID="5000" REFERENCE_ID="[null]" ROOTNODE_ID="5001"/>
    <CLASSIFICATION ID="5001" CREATED="2018-06-26 09:03:54.0" UUID="029b4c07-5903-4dcf-87e8-406ed0e0285f" UPDATED="2018-06-26 09:03:54.908" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Checklist" MICROREFERENCE="[null]" TIMEPERIOD_START="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_END="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" NAME_ID="5001" REFERENCE_ID="[null]" ROOTNODE_ID="5004"/>
-  <TAXONNODE ID="5000" CREATED="2018-06-26 09:03:54.0" UUID="62fa918d-a1d8-4284-ae4b-93478bde8656" UPDATED="[null]" SORTINDEX="0" TREEINDEX="#t5000#5001#5000#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5001" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
-  <TAXONNODE ID="5001" CREATED="2018-06-26 09:03:54.0" UUID="98f0f11b-36b7-4d07-bc8a-27f749bd5c23" UPDATED="2018-06-26 09:03:54.907" SORTINDEX="-1" TREEINDEX="#t5000#5001#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
-  <TAXONNODE ID="5002" CREATED="2018-06-26 09:03:54.0" UUID="dce3defa-5123-44a7-8008-0cc9b27461f6" UPDATED="2018-06-26 09:03:54.908" SORTINDEX="0" TREEINDEX="#t5000#5001#5000#5002#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>
-  <TAXONNODE ID="5003" CREATED="2018-06-26 09:03:54.0" UUID="f8306fd3-9825-41bf-94aa-a7b5790b553e" UPDATED="[null]" SORTINDEX="0" TREEINDEX="#t5001#5004#5003#" COUNTCHILDREN="2" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="5004" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5002"/>
-  <TAXONNODE ID="5004" CREATED="2018-06-26 09:03:54.0" UUID="d7cf3b5d-a758-44c5-be66-5a5cedfa8868" UPDATED="2018-06-26 09:03:54.908" SORTINDEX="-1" TREEINDEX="#t5001#5004#" COUNTCHILDREN="2" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
-  <TAXONNODE ID="5005" CREATED="2018-06-26 09:03:54.0" UUID="c70f76e5-2dcb-41c5-ae6f-d756e0a0fae0" UPDATED="2018-06-26 09:03:54.908" SORTINDEX="0" TREEINDEX="#t5001#5004#5003#5005#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="5003" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5003"/>
-  <TAXONNODE ID="5006" CREATED="2018-06-26 09:03:54.0" UUID="06d58161-7707-44b5-b720-6c0eb916b37c" UPDATED="[null]" SORTINDEX="0" TREEINDEX="#t5001#5004#5003#5005#5006#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="5005" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5004"/>
-  <TAXONNODE ID="5007" CREATED="2018-06-26 09:03:54.0" UUID="6dfd30dd-e589-493a-b66a-19c4cb374f92" UPDATED="2018-06-26 09:03:54.908" SORTINDEX="1" TREEINDEX="#t5001#5004#5003#5007#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="5003" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5005"/>
-  <TAXONNODE ID="5008" CREATED="2018-06-26 09:03:54.0" UUID="5d8e8341-f5e9-4616-96cf-f0351dda42f4" UPDATED="2018-06-26 09:03:54.908" SORTINDEX="1" TREEINDEX="#t5001#5004#5008#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="5004" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5006"/>
+  <TAXONNODE ID="5000" CREATED="2018-06-26 09:03:54.0" UUID="62fa918d-a1d8-4284-ae4b-93478bde8656" UPDATED="[null]" SORTINDEX="0" TREEINDEX="#t5000#5001#5000#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5001" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
+  <TAXONNODE ID="5001" CREATED="2018-06-26 09:03:54.0" UUID="98f0f11b-36b7-4d07-bc8a-27f749bd5c23" UPDATED="2018-06-26 09:03:54.907" SORTINDEX="-1" TREEINDEX="#t5000#5001#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
+  <TAXONNODE ID="5002" CREATED="2018-06-26 09:03:54.0" UUID="dce3defa-5123-44a7-8008-0cc9b27461f6" UPDATED="2018-06-26 09:03:54.908" SORTINDEX="0" TREEINDEX="#t5000#5001#5000#5002#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>
+  <TAXONNODE ID="5003" CREATED="2018-06-26 09:03:54.0" UUID="f8306fd3-9825-41bf-94aa-a7b5790b553e" UPDATED="[null]" SORTINDEX="0" TREEINDEX="#t5001#5004#5003#" COUNTCHILDREN="2" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="5004" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5002"/>
+  <TAXONNODE ID="5004" CREATED="2018-06-26 09:03:54.0" UUID="d7cf3b5d-a758-44c5-be66-5a5cedfa8868" UPDATED="2018-06-26 09:03:54.908" SORTINDEX="-1" TREEINDEX="#t5001#5004#" COUNTCHILDREN="2" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
+  <TAXONNODE ID="5005" CREATED="2018-06-26 09:03:54.0" UUID="c70f76e5-2dcb-41c5-ae6f-d756e0a0fae0" UPDATED="2018-06-26 09:03:54.908" SORTINDEX="0" TREEINDEX="#t5001#5004#5003#5005#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="5003" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5003"/>
+  <TAXONNODE ID="5006" CREATED="2018-06-26 09:03:54.0" UUID="06d58161-7707-44b5-b720-6c0eb916b37c" UPDATED="[null]" SORTINDEX="0" TREEINDEX="#t5001#5004#5003#5005#5006#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="5005" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5004"/>
+  <TAXONNODE ID="5007" CREATED="2018-06-26 09:03:54.0" UUID="6dfd30dd-e589-493a-b66a-19c4cb374f92" UPDATED="2018-06-26 09:03:54.908" SORTINDEX="1" TREEINDEX="#t5001#5004#5003#5007#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="5003" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5005"/>
+  <TAXONNODE ID="5008" CREATED="2018-06-26 09:03:54.0" UUID="5d8e8341-f5e9-4616-96cf-f0351dda42f4" UPDATED="2018-06-26 09:03:54.908" SORTINDEX="1" TREEINDEX="#t5001#5004#5008#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="FALSE" DOUBTFUL="FALSE" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="5004" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5006"/>
    <LANGUAGESTRING ID="5000" CREATED="2018-06-26 09:03:54.0" UUID="4278ecae-c434-4067-939c-356fe61f7b17" UPDATED="[null]" TEXT="Checklist2" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" LANGUAGE_ID="406"/>
    <LANGUAGESTRING ID="5001" CREATED="2018-06-26 09:03:54.0" UUID="2f155ffd-b11d-4bb3-ba3b-a0e2315d549a" UPDATED="[null]" TEXT="Checklist" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" LANGUAGE_ID="406"/>
    <HIBERNATE_SEQUENCES SEQUENCE_NAME="AuditEvent" NEXT_VAL="5003"/>
diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.testGetUuidAndTitleCacheHierarchy.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.testGetUuidAndTitleCacheHierarchy.xml

index 5d209b988c116a2f0b419eb56132adeac0a1e6f8..da5be9aa99ae9cd3b72a06e0e2c53b6a32d2d9f0 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.testGetUuidAndTitleCacheHierarchy.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.testGetUuidAndTitleCacheHierarchy.xml
@@ -16,12 +16,12 @@
    <HOMOTYPICALGROUP ID="5003" CREATED="2016-10-25 16:13:05.0" UUID="cff5b2d9-a537-449c-b45a-9527049ac7b2" UPDATED="[null]" UPDATEDBY_ID="[null]"/>
    <HOMOTYPICALGROUP ID="5004" CREATED="2016-10-25 16:13:05.0" UUID="eccf90e0-fe60-4337-93fa-dca56ec3d1f6" UPDATED="[null]" UPDATEDBY_ID="[null]"/>
    <CLASSIFICATION ID="5000" CREATED="2016-10-25 16:13:05.0" UUID="029b4c07-5903-4dcf-87e8-406ed0e0285f" UPDATED="2016-10-25 16:13:05.413" PROTECTEDTITLECACHE="false" TITLECACHE="Checklist" NAME_ID="5000" REFERENCE_ID="[null]" ROOTNODE_ID="5001"/>
-  <TAXONNODE ID="5000" CREATED="2016-10-25 16:13:05.0" UUID="f686e39a-2aaf-47e3-a488-34e9e71d4540" UPDATED="[null]" SORTINDEX="0" TREEINDEX="#t5000#5001#5000#" COUNTCHILDREN="2" EXCLUDED="false" UNPLACED="false" CLASSIFICATION_ID="5000" PARENT_ID="5001" TAXON_ID="5000"/>
-  <TAXONNODE ID="5001" CREATED="2016-10-25 16:13:05.0" UUID="adb86c10-8411-4b94-973e-813400343662" UPDATED="2016-10-25 16:13:05.414" SORTINDEX="-1" TREEINDEX="#t5000#5001#" COUNTCHILDREN="2" EXCLUDED="false" UNPLACED="false" CLASSIFICATION_ID="5000" PARENT_ID="[null]" TAXON_ID="[null]"/>
-  <TAXONNODE ID="5002" CREATED="2016-10-25 16:13:05.0" UUID="e0c69b90-859d-439c-b958-4969ba329dc6" UPDATED="2016-10-25 16:13:05.415" SORTINDEX="0" TREEINDEX="#t5000#5001#5000#5002#" COUNTCHILDREN="1" EXCLUDED="false" UNPLACED="false" CLASSIFICATION_ID="5000" PARENT_ID="5000" TAXON_ID="5001"/>
-  <TAXONNODE ID="5003" CREATED="2016-10-25 16:13:05.0" UUID="0e4187fe-4d26-43ed-bc49-b3f1525038b9" UPDATED="[null]" SORTINDEX="0" TREEINDEX="#t5000#5001#5000#5002#5003#" COUNTCHILDREN="0" EXCLUDED="false" UNPLACED="false" CLASSIFICATION_ID="5000" PARENT_ID="5002" TAXON_ID="5002"/>
-  <TAXONNODE ID="5004" CREATED="2016-10-25 16:13:05.0" UUID="e8d081c7-1833-41d2-a7ee-b481d11178c2" UPDATED="2016-10-25 16:13:05.415" SORTINDEX="1" TREEINDEX="#t5000#5001#5000#5004#" COUNTCHILDREN="0" EXCLUDED="false" UNPLACED="false" CLASSIFICATION_ID="5000" PARENT_ID="5000" TAXON_ID="5003"/>
-  <TAXONNODE ID="5005" CREATED="2016-10-25 16:13:05.0" UUID="5fff3711-fac9-4de9-81ce-84d0085ab561" UPDATED="2016-10-25 16:13:05.415" SORTINDEX="1" TREEINDEX="#t5000#5001#5005#" COUNTCHILDREN="0" EXCLUDED="false" UNPLACED="false" CLASSIFICATION_ID="5000" PARENT_ID="5001" TAXON_ID="5004"/>
+  <TAXONNODE ID="5000" CREATED="2016-10-25 16:13:05.0" UUID="f686e39a-2aaf-47e3-a488-34e9e71d4540" SORTINDEX="0"  TREEINDEX="#t5000#5001#5000#" COUNTCHILDREN="2" EXCLUDED="false" UNPLACED="false" DOUBTFUL="false" CLASSIFICATION_ID="5000" PARENT_ID="5001" TAXON_ID="5000"/>
+  <TAXONNODE ID="5001" CREATED="2016-10-25 16:13:05.0" UUID="adb86c10-8411-4b94-973e-813400343662" SORTINDEX="-1" TREEINDEX="#t5000#5001#"      COUNTCHILDREN="2" EXCLUDED="false" UNPLACED="false" DOUBTFUL="false" CLASSIFICATION_ID="5000" PARENT_ID="[null]" TAXON_ID="[null]"/>
+  <TAXONNODE ID="5002" CREATED="2016-10-25 16:13:05.0" UUID="e0c69b90-859d-439c-b958-4969ba329dc6" SORTINDEX="0"  TREEINDEX="#t5000#5001#5000#5002#"      COUNTCHILDREN="1" EXCLUDED="false" UNPLACED="false" DOUBTFUL="false" CLASSIFICATION_ID="5000" PARENT_ID="5000" TAXON_ID="5001"/>
+  <TAXONNODE ID="5003" CREATED="2016-10-25 16:13:05.0" UUID="0e4187fe-4d26-43ed-bc49-b3f1525038b9" SORTINDEX="0"  TREEINDEX="#t5000#5001#5000#5002#5003#" COUNTCHILDREN="0" EXCLUDED="false" UNPLACED="false" DOUBTFUL="false" CLASSIFICATION_ID="5000" PARENT_ID="5002" TAXON_ID="5002"/>
+  <TAXONNODE ID="5004" CREATED="2016-10-25 16:13:05.0" UUID="e8d081c7-1833-41d2-a7ee-b481d11178c2" SORTINDEX="1"  TREEINDEX="#t5000#5001#5000#5004#"      COUNTCHILDREN="0" EXCLUDED="false" UNPLACED="false" DOUBTFUL="false" CLASSIFICATION_ID="5000" PARENT_ID="5000" TAXON_ID="5003"/>
+  <TAXONNODE ID="5005" CREATED="2016-10-25 16:13:05.0" UUID="5fff3711-fac9-4de9-81ce-84d0085ab561" SORTINDEX="1"  TREEINDEX="#t5000#5001#5005#" COUNTCHILDREN="0" EXCLUDED="false" UNPLACED="false" DOUBTFUL="false" CLASSIFICATION_ID="5000" PARENT_ID="5001" TAXON_ID="5004"/>
    <LANGUAGESTRING ID="5000" CREATED="2016-10-25 16:13:05.0" UUID="7f7fb54b-759b-4453-9098-7abaa4179d1d" UPDATED="[null]" TEXT="Checklist" LANGUAGE_ID="406"/>
    <HIBERNATE_SEQUENCES SEQUENCE_NAME="AuditEvent" NEXT_VAL="5003"/>
    <HIBERNATE_SEQUENCES SEQUENCE_NAME="CdmMetaData" NEXT_VAL="5003"/>
diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.testSetSecundumForSubtree.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.testSetSecundumForSubtree.xml

index 41f8a919d3bf654d48d798037fbb6bc40ceee0a8..2a1dbc8adcd98ee234010a757d5b6051bde33f94 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.testSetSecundumForSubtree.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.testSetSecundumForSubtree.xml
@@ -6,13 +6,13 @@
      <CLASSIFICATION ID="2" UUID="6aa9819a-9bd5-4b54-9149-ed0a832305da"  PROTECTEDTITLECACHE="true" ROOTNODE_ID = "10"/>
     <!-- <CLASSIFICATION_TAXONNODE CLASSIFICATION_ID="1" ROOTNODES_ID="1" SORTINDEX="0"/> --> 
  
-    <TAXONNODE ID="1" TAXON_ID="[null]" PARENT_ID="[null]" SORTINDEX="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="1" UUID="324a1a77-689c-44be-8e65-347d835f4111" COUNTCHILDREN="2" TREEINDEX="#t1#1#"/>
-    <TAXONNODE ID="2" TAXON_ID="1" PARENT_ID="1" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="1" UUID="484a1a77-689c-44be-8e65-347d835f47e8"  COUNTCHILDREN="0" TREEINDEX="#t1#1#2#"/>
-    <TAXONNODE ID="3" TAXON_ID="2" PARENT_ID="1" SORTINDEX="1" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="1" UUID="2d41f0c2-b785-4f73-a436-cc2d5e93cc5b"  COUNTCHILDREN="0" TREEINDEX="#t1#1#3#"/>
-       <TAXONNODE ID="4" TAXON_ID="5" PARENT_ID="2" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="1" UUID="2fbf7bf5-22dd-4c1a-84e4-c8c93d1f0342"  COUNTCHILDREN="0" TREEINDEX="#t1#1#2#4#"/>
-<!--     <TAXONNODE ID="5" TAXON_ID="1" PARENT_ID="2" SORTINDEX="1" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="1" UUID="cb209758-38d9-440e-9c54-a28dbd8039ea"  COUNTCHILDREN="0" TREEINDEX="#t1#1#2#5#"/> -->
-    <TAXONNODE ID="10" TAXON_ID="[null]" PARENT_ID="[null]" SORTINDEX="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="2" UUID="93bd0c60-dd41-4cbc-9228-7e01a7de0526" COUNTCHILDREN="1" TREEINDEX="#t2#10#"/>
-    <TAXONNODE ID="11" TAXON_ID="1" PARENT_ID="10" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="2" UUID="9af57eda-9f38-47a2-a8e0-b5c8fd363dde"  COUNTCHILDREN="0" TREEINDEX="#t2#10#11#"/>
+    <TAXONNODE ID="1" TAXON_ID="[null]" PARENT_ID="[null]" SORTINDEX="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="1" UUID="324a1a77-689c-44be-8e65-347d835f4111" COUNTCHILDREN="2" TREEINDEX="#t1#1#"/>
+    <TAXONNODE ID="2" TAXON_ID="1" PARENT_ID="1" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="1" UUID="484a1a77-689c-44be-8e65-347d835f47e8"  COUNTCHILDREN="0" TREEINDEX="#t1#1#2#"/>
+    <TAXONNODE ID="3" TAXON_ID="2" PARENT_ID="1" SORTINDEX="1" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="1" UUID="2d41f0c2-b785-4f73-a436-cc2d5e93cc5b"  COUNTCHILDREN="0" TREEINDEX="#t1#1#3#"/>
+       <TAXONNODE ID="4" TAXON_ID="5" PARENT_ID="2" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="1" UUID="2fbf7bf5-22dd-4c1a-84e4-c8c93d1f0342"  COUNTCHILDREN="0" TREEINDEX="#t1#1#2#4#"/>
+<!--     <TAXONNODE ID="5" TAXON_ID="1" PARENT_ID="2" SORTINDEX="1" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="1" UUID="cb209758-38d9-440e-9c54-a28dbd8039ea"  COUNTCHILDREN="0" TREEINDEX="#t1#1#2#5#"/> -->
+    <TAXONNODE ID="10" TAXON_ID="[null]" PARENT_ID="[null]" SORTINDEX="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="2" UUID="93bd0c60-dd41-4cbc-9228-7e01a7de0526" COUNTCHILDREN="1" TREEINDEX="#t2#10#"/>
+    <TAXONNODE ID="11" TAXON_ID="1" PARENT_ID="10" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="2" UUID="9af57eda-9f38-47a2-a8e0-b5c8fd363dde"  COUNTCHILDREN="0" TREEINDEX="#t2#10#11#"/>
   
      <TAXONBASE DTYPE="Taxon" ID="1" UUID="55c3e41a-c629-40e6-aa6a-ff274ac6ddb1"        PROTECTEDTITLECACHE="false" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false"/>
      <TAXONBASE DTYPE="Taxon" ID="2" UUID="2659a7e0-ff35-4ee4-8493-b453756ab955"        PROTECTEDTITLECACHE="false" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false"/>
diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.xml

index 23d490391ac81925a66a0d43ce11b8278b50be25..42fde3ef8a3aae5209887915093798ca9e6629ff 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.xml
@@ -4,10 +4,10 @@
      <CLASSIFICATION ID="1" UUID="6c2bc8d9-ee62-4222-be89-4a8e31770878"  PROTECTEDTITLECACHE="true" ROOTNODE_ID = "1"/>
     <!-- <CLASSIFICATION_TAXONNODE CLASSIFICATION_ID="1" ROOTNODES_ID="1" SORTINDEX="0"/> --> 
  
-    <TAXONNODE ID="1" TAXON_ID="[null]" PARENT_ID="[null]" SORTINDEX="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="1" UUID="324a1a77-689c-44be-8e65-347d835f4111" COUNTCHILDREN="2" TREEINDEX="#t1#1#"/>
-    <TAXONNODE ID="2" TAXON_ID="1" PARENT_ID="1" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="1" UUID="484a1a77-689c-44be-8e65-347d835f47e8"  COUNTCHILDREN="0" TREEINDEX="#t1#1#2#"/>
-    <TAXONNODE ID="3" TAXON_ID="2" PARENT_ID="1" SORTINDEX="1" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="1" UUID="2d41f0c2-b785-4f73-a436-cc2d5e93cc5b"  COUNTCHILDREN="0" TREEINDEX="#t1#1#3#"/>
-       <TAXONNODE ID="4" TAXON_ID="5" PARENT_ID="2" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" CLASSIFICATION_ID="1" UUID="2fbf7bf5-22dd-4c1a-84e4-c8c93d1f0342"  COUNTCHILDREN="0" TREEINDEX="#t1#1#2#1#"/>
+    <TAXONNODE ID="1" TAXON_ID="[null]" PARENT_ID="[null]" SORTINDEX="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="1" UUID="324a1a77-689c-44be-8e65-347d835f4111" COUNTCHILDREN="2" TREEINDEX="#t1#1#"/>
+    <TAXONNODE ID="2" TAXON_ID="1"      PARENT_ID="1"      SORTINDEX="0"      EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="1" UUID="484a1a77-689c-44be-8e65-347d835f47e8" COUNTCHILDREN="0" TREEINDEX="#t1#1#2#"/>
+    <TAXONNODE ID="3" TAXON_ID="2"      PARENT_ID="1"      SORTINDEX="1"      EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="1" UUID="2d41f0c2-b785-4f73-a436-cc2d5e93cc5b" COUNTCHILDREN="0" TREEINDEX="#t1#1#3#"/>
+       <TAXONNODE ID="4" TAXON_ID="5"      PARENT_ID="2"      SORTINDEX="0"      EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" CLASSIFICATION_ID="1" UUID="2fbf7bf5-22dd-4c1a-84e4-c8c93d1f0342" COUNTCHILDREN="0" TREEINDEX="#t1#1#2#1#"/>
   
      <TAXONBASE DTYPE="Taxon" ID="1" NAME_ID="1" UUID="55c3e41a-c629-40e6-aa6a-ff274ac6ddb1"    PROTECTEDTITLECACHE="false" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false"/>
      <TAXONBASE DTYPE="Taxon" ID="2"  NAME_ID="2" UUID="2659a7e0-ff35-4ee4-8493-b453756ab955"   PROTECTEDTITLECACHE="false" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false"/>
diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.testInferredSynonyms.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.testInferredSynonyms.xml

index aaec9410b3a2558f2f13fc642b847bf2776485f9..a92b131926bc5ccba2cc7ff0e5fc577a618bf0c2 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.testInferredSynonyms.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.testInferredSynonyms.xml
@@ -18,10 +18,10 @@
    <TAXONNAME NAMETYPE="ICZN" ID="40" CREATED="2008-12-10 09:56:07.0" UUID="57d756e1-9381-43f1-8705-d29e7046483a" UPDATED="2008-12-10 09:56:07.238" TITLECACHE="SynGenus" PROTECTEDTITLECACHE="true" PARSINGPROBLEM="0" FULLTITLECACHE="" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="true" AUTHORSHIPCACHE="(Fabricius, 1797)" NAMECACHE="SynGenus" PROTECTEDAUTHORSHIPCACHE="true" PROTECTEDNAMECACHE="true" ANAMORPHIC="false"  BINOMHYBRID="false" HYBRIDFORMULA="false" MONOMHYBRID="false" TRINOMHYBRID="false"  RANK_ID="774" GENUSORUNINOMIAL="SynGenus" SPECIFICEPITHET="[null]"/>\r
    <TAXONNAME NAMETYPE="ICNAFP" ID="41" CREATED="2008-12-10 09:56:07.0" UUID="507b60dd-113d-4ab7-9665-25d0374bd6d1" UPDATED="2008-12-10 09:56:07.238" TITLECACHE="test" PROTECTEDTITLECACHE="true" PARSINGPROBLEM="0" FULLTITLECACHE="" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="true" AUTHORSHIPCACHE="(Fabricius, 1797)" NAMECACHE="Acherontia ciprosus" PROTECTEDAUTHORSHIPCACHE="true" PROTECTEDNAMECACHE="true" ANAMORPHIC="false"  BINOMHYBRID="false" HYBRIDFORMULA="false" MONOMHYBRID="false" TRINOMHYBRID="false"  RANK_ID="765" GENUSORUNINOMIAL="Acherontia" SPECIFICEPITHET="ciprosus" />\r
  \r
-  <TAXONNODE ID="1" CREATED="2009-06-18 13:47:59.0" UUID="0b5846e5-b8d2-4ca9-ac51-099286ea4adc" COUNTCHILDREN="0" EXCLUDED="FALSE" UNPLACED="FALSE" TAXON_ID="38" PARENT_ID="3" CLASSIFICATION_ID="1" TREEINDEX="#t1#4#3#1#" SORTINDEX="0"/>\r
-  <TAXONNODE ID="2" CREATED="2009-06-18 13:47:59.0" UUID="770239f6-4fa8-496b-8738-fe8f7b2ad519" COUNTCHILDREN="0" EXCLUDED="FALSE" UNPLACED="FALSE" TAXON_ID="37" PARENT_ID="3" CLASSIFICATION_ID="1" TREEINDEX="#t1#4#3#2#" SORTINDEX="1"/>\r
-  <TAXONNODE ID="3" CREATED="2009-06-18 13:47:59.0" UUID="20c8f083-5870-4cbd-bf56-c5b2b98ab6a7" COUNTCHILDREN="2" EXCLUDED="FALSE" UNPLACED="FALSE" TAXON_ID="36" PARENT_ID="4" CLASSIFICATION_ID="1" TREEINDEX="#t1#4#3#" SORTINDEX="0"/>\r
-  <TAXONNODE ID="4" CREATED="2009-06-18 13:47:59.0" UUID="f5721e7a-3d2e-488c-89f0-3c131b44f942" COUNTCHILDREN="1" EXCLUDED="FALSE" UNPLACED="FALSE" TAXON_ID="[null]" PARENT_ID="[null]" CLASSIFICATION_ID="1" TREEINDEX="#t1#4#" SORTINDEX="[null]"/>\r
+  <TAXONNODE ID="1" CREATED="2009-06-18 13:47:59.0" UUID="0b5846e5-b8d2-4ca9-ac51-099286ea4adc" COUNTCHILDREN="0" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" TAXON_ID="38" PARENT_ID="3" CLASSIFICATION_ID="1" TREEINDEX="#t1#4#3#1#" SORTINDEX="0"/>\r
+  <TAXONNODE ID="2" CREATED="2009-06-18 13:47:59.0" UUID="770239f6-4fa8-496b-8738-fe8f7b2ad519" COUNTCHILDREN="0" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" TAXON_ID="37" PARENT_ID="3" CLASSIFICATION_ID="1" TREEINDEX="#t1#4#3#2#" SORTINDEX="1"/>\r
+  <TAXONNODE ID="3" CREATED="2009-06-18 13:47:59.0" UUID="20c8f083-5870-4cbd-bf56-c5b2b98ab6a7" COUNTCHILDREN="2" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" TAXON_ID="36" PARENT_ID="4" CLASSIFICATION_ID="1" TREEINDEX="#t1#4#3#" SORTINDEX="0"/>\r
+  <TAXONNODE ID="4" CREATED="2009-06-18 13:47:59.0" UUID="f5721e7a-3d2e-488c-89f0-3c131b44f942" COUNTCHILDREN="1" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" TAXON_ID="[null]" PARENT_ID="[null]" CLASSIFICATION_ID="1" TREEINDEX="#t1#4#" SORTINDEX="[null]"/>\r
  \r
    <CLASSIFICATION ID="1" CREATED="2009-06-18 13:47:59.0" UUID="aeee7448-5298-4991-b724-8d5b75a0a7a9" PROTECTEDTITLECACHE="false" TITLECACHE="TestBaum" ROOTNODE_ID="4"/>\r
  \r
diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTaxaAndNamesTest.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTaxaAndNamesTest.xml

index 2614dd810ce29c46c50f8c4a68db5854ec625dd3..c71fd557b9a9e85d38d63ab10072bd2ae598e351 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTaxaAndNamesTest.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTaxaAndNamesTest.xml
@@ -46,8 +46,8 @@
    <HOMOTYPICALGROUP ID="5009" CREATED="2017-01-20 21:58:08.0" UUID="dc106482-4f11-4c25-ad9a-e7e027b6a977" UPDATED="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]"/>
    <CLASSIFICATION ID="5000" CREATED="2017-01-20 21:58:08.0" UUID="2a5ceebb-4830-4524-b330-78461bf8cb6b" UPDATED="2017-01-20 21:58:08.345" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="European Abies" MICROREFERENCE="[null]" TIMEPERIOD_START="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_END="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" NAME_ID="5000" REFERENCE_ID="[null]" ROOTNODE_ID="5000"/>
    <CLASSIFICATION ID="5001" CREATED="2017-01-20 21:58:08.0" UUID="d7c741e3-ae9e-4a7d-a566-9e3a7a0b51ce" UPDATED="2017-01-20 21:58:08.347" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Abies alternative" MICROREFERENCE="[null]" TIMEPERIOD_START="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_END="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" NAME_ID="5001" REFERENCE_ID="[null]" ROOTNODE_ID="5001"/>
-  <TAXONNODE ID="5000" CREATED="2017-01-20 21:58:08.0" UUID="95ec6af8-012e-4da1-b1f4-d36286c1341b" UPDATED="2017-01-20 21:58:08.346" SORTINDEX="-1" TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
-  <TAXONNODE ID="5001" CREATED="2017-01-20 21:58:08.0" UUID="d41c22e6-a64b-4363-b530-835be88ef06f" UPDATED="2017-01-20 21:58:08.348" SORTINDEX="-1" TREEINDEX="#t5001#5001#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
+  <TAXONNODE ID="5000" CREATED="2017-01-20 21:58:08.0" UUID="95ec6af8-012e-4da1-b1f4-d36286c1341b" UPDATED="2017-01-20 21:58:08.346" SORTINDEX="-1" TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="false" DOUBTFUL="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
+  <TAXONNODE ID="5001" CREATED="2017-01-20 21:58:08.0" UUID="d41c22e6-a64b-4363-b530-835be88ef06f" UPDATED="2017-01-20 21:58:08.348" SORTINDEX="-1" TREEINDEX="#t5001#5001#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="false" DOUBTFUL="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
    <TAXONNODE ID="5002" CREATED="2017-01-20 21:58:08.0" UUID="8fcd2eba-8e13-4bdd-bad3-363529edcab7" UPDATED="[null]" SORTINDEX="0" TREEINDEX="#t5000#5000#5002#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5003"/>
    <TAXONNODE ID="5003" CREATED="2017-01-20 21:58:08.0" UUID="1b28f33b-bce5-449d-a23e-3ac02746c54c" UPDATED="[null]" SORTINDEX="0" TREEINDEX="#t5001#5001#5003#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" EXCLUDED="false" UNPLACED="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5001" PARENT_ID="5001" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5007"/>
    <LANGUAGESTRING ID="5000" CREATED="2017-01-20 21:58:08.0" UUID="cd8d8677-d2aa-41bd-8efc-bd9a9ae38d45" UPDATED="[null]" TEXT="European Abies" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" LANGUAGE_ID="406"/>
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 202cb429bedbc6e5becdd1a4494fb0d43a2e9059..aafb894859c8ffc93805699b8205684b1c40c107 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
@@ -5,11 +5,11 @@
    <CLASSIFICATION ID="5001" UUID="d7c741e3-ae9e-4a7d-a566-9e3a7a0b51ce" ROOTNODE_ID="5001" PROTECTEDTITLECACHE="false" TITLECACHE="Abies alternative" MICROREFERENCE="[null]" NAME_ID="5001"/>
    <CLASSIFICATION_AUD/>
      
-  <TAXONNODE ID="5000" UUID="a8266e45-091f-432f-87ae-c625e6aa9bbc" TREEINDEX="#t5000#5000#" SORTINDEX="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" COUNTCHILDREN="1" CLASSIFICATION_ID="5000" PARENT_ID="[null]" TAXON_ID="[null]"/>
-  <TAXONNODE ID="5002" UUID="bf379dec-349a-4b95-bb02-1d6bf785983b" TREEINDEX="#t5000#5000#5002#" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="5000" TAXON_ID="5003"/>
-  <TAXONNODE ID="5001" UUID="1ff4255d-7c6c-4d01-aaae-7acc2cd3dda1" TREEINDEX="#t5001#5001#" SORTINDEX="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" COUNTCHILDREN="1" CLASSIFICATION_ID="5001" PARENT_ID="[null]" TAXON_ID="[null]"/>
-  <TAXONNODE ID="5003" UUID="54f12949-9229-416c-9246-7bbc4d0f77a5" TREEINDEX="#t5001#5001#5003#" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" COUNTCHILDREN="1" CLASSIFICATION_ID="5001" PARENT_ID="5001" TAXON_ID="5007"/>
-  <!--  TAXONNODE ID="5004" UUID="55f12949-9229-416c-9246-7bbc4d0f77a5" TREEINDEX="#t5001#5001#5003#5004#" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" COUNTCHILDREN="0" CLASSIFICATION_ID="5001" PARENT_ID="5003" TAXON_ID="5003"/>
+  <TAXONNODE ID="5000" UUID="a8266e45-091f-432f-87ae-c625e6aa9bbc" TREEINDEX="#t5000#5000#" SORTINDEX="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" COUNTCHILDREN="1" CLASSIFICATION_ID="5000" PARENT_ID="[null]" TAXON_ID="[null]"/>
+  <TAXONNODE ID="5002" UUID="bf379dec-349a-4b95-bb02-1d6bf785983b" TREEINDEX="#t5000#5000#5002#" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="5000" TAXON_ID="5003"/>
+  <TAXONNODE ID="5001" UUID="1ff4255d-7c6c-4d01-aaae-7acc2cd3dda1" TREEINDEX="#t5001#5001#" SORTINDEX="[null]" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" COUNTCHILDREN="1" CLASSIFICATION_ID="5001" PARENT_ID="[null]" TAXON_ID="[null]"/>
+  <TAXONNODE ID="5003" UUID="54f12949-9229-416c-9246-7bbc4d0f77a5" TREEINDEX="#t5001#5001#5003#" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" COUNTCHILDREN="1" CLASSIFICATION_ID="5001" PARENT_ID="5001" TAXON_ID="5007"/>
+  <!--  TAXONNODE ID="5004" UUID="55f12949-9229-416c-9246-7bbc4d0f77a5" TREEINDEX="#t5001#5001#5003#5004#" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" COUNTCHILDREN="0" CLASSIFICATION_ID="5001" PARENT_ID="5003" TAXON_ID="5003"/>
     -->
    <TAXONBASE DTYPE="Taxon"   ID="5000" UUID="3e72d306-0f83-4d4f-be84-6f85a604a2be" PROTECTEDTITLECACHE="false" TITLECACHE="Abies sec. Kohlbecker, A., Testcase standart views, 2013"            DOUBTFUL="false" publish="true"  USENAMECACHE="false" TAXONSTATUSUNKNOWN="false"  NAME_ID="5000" SEC_ID="5000"/>
    <TAXONBASE DTYPE="Taxon"   ID="5001" UUID="7dbd5810-a3e5-44b6-b563-25152b8867f4" PROTECTEDTITLECACHE="false" TITLECACHE="Abies alba sec. Kohlbecker, A., Testcase standart views, 2013"       DOUBTFUL="false" publish="true"  USENAMECACHE="false" TAXONSTATUSUNKNOWN="false"  NAME_ID="5001" SEC_ID="5000"/>
diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TransmissionEngineDistributionTest.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TransmissionEngineDistributionTest.xml

index c05d17b0ca1fbee2fd5874da2afd7be81ad21e48..63d5e69764d596f4d45330c401686e96fb69f0d9 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TransmissionEngineDistributionTest.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TransmissionEngineDistributionTest.xml
@@ -13,12 +13,12 @@
    <REFERENCE ID="5000" CREATED="2016-06-27 14:26:11.0" UUID="b59c0842-fba3-4255-8e32-5a064303b8a2" UPDATED="[null]" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="true" TITLECACHE="Sp.Pl." DATEPUBLISHED_END="[null]" DATEPUBLISHED_FREETEXT="[null]" DATEPUBLISHED_START="[null]" EDITION="[null]" EDITOR="[null]" ISBN="[null]" ISSN="[null]" DOI="[null]" NOMENCLATURALLYRELEVANT="false" ORGANIZATION="[null]" PAGES="[null]" PARSINGPROBLEM="0" PLACEPUBLISHED="[null]" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PUBLISHER="[null]" REFERENCEABSTRACT="[null]" SERIESPART="[null]" TITLE="[null]" ABBREVTITLE="[null]" ABBREVTITLECACHE="" PROTECTEDABBREVTITLECACHE="false" REFTYPE="DB" URI="[null]" VOLUME="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" AUTHORSHIP_ID="[null]" INREFERENCE_ID="[null]" INSTITUTION_ID="[null]" SCHOOL_ID="[null]"/>
    <REFERENCE ID="5001" CREATED="2016-06-27 14:26:11.0" UUID="3268a382-f51a-495e-8de6-763854944c7d" UPDATED="[null]" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Reference [type=Book, id= 0, uuid=3268a382-f51a-495e-8de6-763854944c7d]" DATEPUBLISHED_END="[null]" DATEPUBLISHED_FREETEXT="[null]" DATEPUBLISHED_START="[null]" EDITION="[null]" EDITOR="[null]" ISBN="[null]" ISSN="[null]" DOI="[null]" NOMENCLATURALLYRELEVANT="false" ORGANIZATION="[null]" PAGES="[null]" PARSINGPROBLEM="0" PLACEPUBLISHED="[null]" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PUBLISHER="[null]" REFERENCEABSTRACT="[null]" SERIESPART="[null]" TITLE="[null]" ABBREVTITLE="[null]" ABBREVTITLECACHE="" PROTECTEDABBREVTITLECACHE="false" REFTYPE="BK" URI="[null]" VOLUME="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" AUTHORSHIP_ID="[null]" INREFERENCE_ID="[null]" INSTITUTION_ID="[null]" SCHOOL_ID="[null]"/>
    <CLASSIFICATION ID="5000" CREATED="2016-06-27 14:26:11.0" UUID="4b266053-a841-4980-b548-3f21d8d7d712" UPDATED="2016-06-27 14:26:11.88" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="TestClassification" MICROREFERENCE="[null]" TIMEPERIOD_START="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_END="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" NAME_ID="5000" REFERENCE_ID="[null]" ROOTNODE_ID="5000"/>
-  <TAXONNODE ID="5000" CREATED="2016-06-27 14:26:11.0" UUID="06512abd-edf9-435b-a3d9-6cd6ede5aec8" UPDATED="2016-06-27 14:26:11.881" SORTINDEX="-1" EXCLUDED="FALSE" UNPLACED="FALSE" TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
-  <TAXONNODE ID="5001" CREATED="2016-06-27 14:26:11.0" UUID="dcf4f891-c486-4d36-b1d1-39fae7a5df2a" UPDATED="[null]" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
-  <TAXONNODE ID="5002" CREATED="2016-06-27 14:26:11.0" UUID="7dbe5319-ae7d-4140-bb3b-c34dc320d134" UPDATED="2016-06-27 14:26:11.882" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" TREEINDEX="#t5000#5000#5001#5002#" COUNTCHILDREN="3" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5001" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>
-  <TAXONNODE ID="5003" CREATED="2016-06-27 14:26:11.0" UUID="4fd6c300-54b7-4f48-bad2-3126ab72a6d0" UPDATED="[null]" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" TREEINDEX="#t5000#5000#5001#5002#5003#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5002" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5002"/>
-  <TAXONNODE ID="5004" CREATED="2016-06-27 14:26:11.0" UUID="5523c20c-bbc2-4c89-8b36-e00e8314d252" UPDATED="2016-06-27 14:26:11.883" SORTINDEX="1" EXCLUDED="FALSE" UNPLACED="FALSE" TREEINDEX="#t5000#5000#5001#5002#5004#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5002" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5003"/>
-  <TAXONNODE ID="5005" CREATED="2016-06-27 14:26:11.0" UUID="65671bba-0373-4998-8a7b-410a67a2ddcf" UPDATED="2016-06-27 14:26:11.884" SORTINDEX="2" EXCLUDED="FALSE" UNPLACED="FALSE" TREEINDEX="#t5000#5000#5001#5002#5005#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5002" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5004"/>
+  <TAXONNODE ID="5000" CREATED="2016-06-27 14:26:11.0" UUID="06512abd-edf9-435b-a3d9-6cd6ede5aec8" UPDATED="2016-06-27 14:26:11.881" SORTINDEX="-1" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
+  <TAXONNODE ID="5001" CREATED="2016-06-27 14:26:11.0" UUID="dcf4f891-c486-4d36-b1d1-39fae7a5df2a" UPDATED="[null]" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
+  <TAXONNODE ID="5002" CREATED="2016-06-27 14:26:11.0" UUID="7dbe5319-ae7d-4140-bb3b-c34dc320d134" UPDATED="2016-06-27 14:26:11.882" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" TREEINDEX="#t5000#5000#5001#5002#" COUNTCHILDREN="3" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5001" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>
+  <TAXONNODE ID="5003" CREATED="2016-06-27 14:26:11.0" UUID="4fd6c300-54b7-4f48-bad2-3126ab72a6d0" UPDATED="[null]" SORTINDEX="0" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" TREEINDEX="#t5000#5000#5001#5002#5003#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5002" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5002"/>
+  <TAXONNODE ID="5004" CREATED="2016-06-27 14:26:11.0" UUID="5523c20c-bbc2-4c89-8b36-e00e8314d252" UPDATED="2016-06-27 14:26:11.883" SORTINDEX="1" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" TREEINDEX="#t5000#5000#5001#5002#5004#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5002" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5003"/>
+  <TAXONNODE ID="5005" CREATED="2016-06-27 14:26:11.0" UUID="65671bba-0373-4998-8a7b-410a67a2ddcf" UPDATED="2016-06-27 14:26:11.884" SORTINDEX="2" EXCLUDED="FALSE" UNPLACED="FALSE" DOUBTFUL="FALSE" TREEINDEX="#t5000#5000#5001#5002#5005#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5002" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5004"/>
    <HOMOTYPICALGROUP ID="5000" CREATED="2016-06-27 14:26:11.0" UUID="207c1e0c-ce60-4516-adf7-0ba5a61ee62f" UPDATED="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]"/>
    <HOMOTYPICALGROUP ID="5001" CREATED="2016-06-27 14:26:11.0" UUID="e18238ce-8d2c-4ac6-bf33-8f019012dfac" UPDATED="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]"/>
    <HOMOTYPICALGROUP ID="5002" CREATED="2016-06-27 14:26:11.0" UUID="85c073ca-bde7-4bdd-be40-e1783132f45e" UPDATED="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]"/>
diff --git a/cdmlib-test/src/main/resources/dbscripts/001-cdm.h2.sql b/cdmlib-test/src/main/resources/dbscripts/001-cdm.h2.sql

index 2bf7e53cc66f5e6b1a725ee9571c2cc55a5a797f..84968b9f466f8057a9203cc5853df0f4526db6cf 100644 (file)
--- a/cdmlib-test/src/main/resources/dbscripts/001-cdm.h2.sql
+++ b/cdmlib-test/src/main/resources/dbscripts/001-cdm.h2.sql
@@ -4691,6 +4691,7 @@ CREATE CACHED TABLE PUBLIC.TAXONNODE(
      MICROREFERENCEFORPARENTCHILDRELATION VARCHAR(255),
         EXCLUDED BOOLEAN,
         UNPLACED BOOLEAN,
+       DOUBTFUL BOOLEAN,
         CREATEDBY_ID INTEGER,
      UPDATEDBY_ID INTEGER,
      CLASSIFICATION_ID INTEGER,
@@ -4763,6 +4764,7 @@ CREATE CACHED TABLE PUBLIC.TAXONNODE_AUD(
      MICROREFERENCEFORPARENTCHILDRELATION VARCHAR(255),
         EXCLUDED BOOLEAN,
         UNPLACED BOOLEAN,
+    DOUBTFUL BOOLEAN,
      CREATEDBY_ID INTEGER,
      UPDATEDBY_ID INTEGER,
      CLASSIFICATION_ID INTEGER,
diff --git a/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/database/schema/dataset.dtd b/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/database/schema/dataset.dtd

index 1f7a05dfd0e0b210634ab7b3fa9ac0dd1c38b25e..e34958605ccbfd6339965d9d2b3911cd40cc1153 100644 (file)
--- a/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/database/schema/dataset.dtd
+++ b/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/database/schema/dataset.dtd
@@ -3459,6 +3459,7 @@
      MICROREFERENCEFORPARENTCHILDRELATION CDATA #IMPLIED
      EXCLUDED CDATA #IMPLIED
      UNPLACED CDATA #IMPLIED
+    DOUBTFUL CDATA #IMPLIED
      CREATEDBY_ID CDATA #IMPLIED
      UPDATEDBY_ID CDATA #IMPLIED
      CLASSIFICATION_ID CDATA #IMPLIED
@@ -3480,6 +3481,7 @@
      MICROREFERENCEFORPARENTCHILDRELATION CDATA #IMPLIED
      EXCLUDED CDATA #IMPLIED
      UNPLACED CDATA #IMPLIED
+    DOUBTFUL CDATA #IMPLIED
      CREATEDBY_ID CDATA #IMPLIED
      UPDATEDBY_ID CDATA #IMPLIED
      CLASSIFICATION_ID CDATA #IMPLIED
author	Andreas Müller <a.mueller@bgbm.org>
	Tue, 23 Jul 2019 20:08:50 +0000 (22:08 +0200)
committer	Andreas Müller <a.mueller@bgbm.org>
	Tue, 23 Jul 2019 20:17:21 +0000 (22:17 +0200)
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java		patch \| blob \| history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v55_58/SchemaUpdater_55_58.java		patch \| blob \| history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/PreferenceDaoTest.testFindTaxonNodeString.xml		patch \| blob \| history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/ClassificationDaoHibernateImplTest.listRankSpecificRootNodes.xml		patch \| blob \| history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testGetTaxaByNameAndArea.xml		patch \| blob \| history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testPropertyPath.xml		patch \| blob \| history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.xml		patch \| blob \| history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.testSortindexForJavassist-result.xml		patch \| blob \| history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.testSortindexForJavassist.xml		patch \| blob \| history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.testSortindexForJavassist2-result.xml		patch \| blob \| history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.xml		patch \| blob \| history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/ClassificationServiceDeepTest.xml		patch \| blob \| history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/ClassificationServiceImplTest.xml		patch \| blob \| history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.testFindByIdentifierOrMarker.xml		patch \| blob \| history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest-testAllKindsOfSpecimenAssociations.xml		patch \| blob \| history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/SecurityTest.xml		patch \| blob \| history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/StatisticsServiceImplTest2.xml		patch \| blob \| history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest-indexing.xml		patch \| blob \| history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest-testFindCommonParentNode.xml		patch \| blob \| history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.testGetUuidAndTitleCacheHierarchy.xml		patch \| blob \| history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.testSetSecundumForSubtree.xml		patch \| blob \| history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.xml		patch \| blob \| history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.testInferredSynonyms.xml		patch \| blob \| history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTaxaAndNamesTest.xml		patch \| blob \| history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.xml		patch \| blob \| history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TransmissionEngineDistributionTest.xml		patch \| blob \| history
cdmlib-test/src/main/resources/dbscripts/001-cdm.h2.sql		patch \| blob \| history
cdmlib-test/src/main/resources/eu/etaxonomy/cdm/database/schema/dataset.dtd		patch \| blob \| history