From: Andreas Müller Date: Thu, 23 Sep 2010 03:49:51 +0000 (+0000) Subject: added tcs files and moved to subfolder X-Git-Tag: 3.0.3~528 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/ee7622df5bd78f81981fee6ac039a59d52742780 added tcs files and moved to subfolder --- diff --git a/.gitattributes b/.gitattributes index d7b197902d..5be5919e2c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1189,7 +1189,8 @@ app-import/src/main/resources/taxonX/palm_tc_98853.xml -text app-import/src/main/resources/taxonX/palm_tc_98863.xml -text app-import/src/main/resources/taxonX/palm_tc_98882.xml -text app-import/src/main/resources/taxonX/palm_tc_98886.xml -text -app-import/src/main/resources/tcsXmlTest.xml -text +app-import/src/main/resources/tcs/Cichorium_tcs.xml -text +app-import/src/main/resources/tcs/tcsXmlTest.xml -text cdm-server/LICENSE.TXT -text cdm-server/ide/eclipse/Bootloader[!!-~]-[!!-~]Help.launch -text cdm-server/ide/eclipse/Bootloader.launch -text diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsSources.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsSources.java index 4376ad9c51..505b6183ef 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsSources.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsSources.java @@ -66,12 +66,19 @@ public class TcsSources { public static String tcsXmlTest_local(){ // tcsXmlTest.xml - URL url = new TcsSources().getClass().getResource("/tcsXmlTest.xml"); + URL url = new TcsSources().getClass().getResource("/tcs/tcsXmlTest.xml"); String sourceUrl = url.toString(); return sourceUrl; } + public static String tcsXml_cichorium(){ + // tcsXmlTest.xml + URL url = new TcsSources().getClass().getResource("/tcs/Cichorium_tcs.xml"); + String sourceUrl = url.toString(); + return sourceUrl; + } + public static String tcsXml_localPath(){ File file = new File("C:\\localCopy\\Data\\tdwg\\Cichorium_tcs.xml"); String sourceUrl; diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsXmlTestActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsXmlTestActivator.java index b21071eef8..6976de9348 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsXmlTestActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsXmlTestActivator.java @@ -36,9 +36,9 @@ public class TcsXmlTestActivator { //database validation status (create, update, validate ...) static DbSchemaValidation hbm2dll = DbSchemaValidation.CREATE; - static final String tcsSource = TcsSources.tcsXmlTest_local2(); + static final String tcsSource = TcsSources.tcsXml_cichorium(); // static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_andreasM2(); - static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_niels1(); + static final ICdmDataSource cdmDestination = CdmDestinations.localH2(); static final UUID treeUuid = UUID.fromString("00000000-0c97-48ac-8d33-6099ed68c625"); static final String sourceSecId = "XXX"; @@ -89,8 +89,7 @@ public class TcsXmlTestActivator { IReferenceService refService = tcsImport.getCdmAppController().getReferenceService(); - ReferenceFactory refFactory = ReferenceFactory.newInstance(); - IBook book = refFactory.newBook(); + IBook book = ReferenceFactory.newBook(); //book.setDatePublished(TimePeriod.NewInstance(1945)); book.setDatePublished(TimePeriod.NewInstance(1945).setEndDay(12).setEndMonth(4)); refService.saveOrUpdate((ReferenceBase)book); diff --git a/app-import/src/main/resources/tcs/Cichorium_tcs.xml b/app-import/src/main/resources/tcs/Cichorium_tcs.xml new file mode 100644 index 0000000000..c4f4059c57 --- /dev/null +++ b/app-import/src/main/resources/tcs/Cichorium_tcs.xml @@ -0,0 +1,718 @@ + + + + + Cichorium Example + + + + Herb. Linn. No. 962.4 (LINN) + + + + + + + EDIT Cichorieae + + + Sp. Pl. + + + Voyage Yemen + + + in Schweinfurth, Beitr. Fl. Äthiop. + + + Consp. Fl. Graec. 2 + + + in Willdenowia 37 + + + Observ. Bot. 4 + + + Syn. Gen. Compos. + + + Compos. Ind. + + + Prodr. Stirp. Chap. Allerton. + + + in Lamarck & Candolle, Fl. Franç. ed. 3, 4 + + + Prodr. 7 + + + Fl. Portug. 2 + + + in Komarov, Fl. SSSR 29 + + + + + Cichorieae Lam. & DC. + + + Cichorieae + Cichorieae + + + Lam. & DC. + + Lam. & DC. + + Lam. + DC. + + + + + + Cichoriinae Dumort + + + Cichoriinae + Cichoriinae + + + Dumort + + Dumort + + Dumort + + + + + + Cichorium L. + + + Cichorium + Cichorium + + + L. + + L. + + L. + + + + + + Cichorium bottae Deflers + + + Cichorium bottae + Cichorium + bottae + + + Deflers + + Deflers + + Deflers + + + + + 1889 + 159 + + + + Cichorium calvum Asch. + + + Cichorium calvum + Cichorium + calvum + + + Asch. + + Asch. + + Asch. + + + + + 1867 + 143 + + + + + Cichorium endivia L. + + + Cichorium endivia + Cichorium + endivia + + + L. + + L. + + L. + + + + + 1753 + 813 + + + Cichorium intybus var. endivia (L.) C. B. Clarke + + + Cichorium intybus var. endivia + Cichorium + intybus + endivia + + + (L.) C. B. Clarke + + L. + + L. + + + + C. B. Clarke + + C. B. Clarke + + + + + 1876 + 250 + + + + Cichorium esculentum Salisb. + + + Cichorium esculentum + Cichorium + esculentum + + + Salisb. + + Salisb. + + Salisb. + + + + + 1796 + 183 + + nom. illeg.nom. illeg. + + + Cichorium endivia var. angustifolium DC. + + + Cichorium endivia var. angustifolium + Cichorium + endivia + angustifolium + + + DC. + + DC. + + DC. + + + + + 1805 + 68 + + + Cichorium endivia var. crispum DC. + + + Cichorium endivia var. crispum + Cichorium + endivia + crispum + + + DC. + + DC. + + DC. + + + + + 1805 + 68 + + + Cichorium endivia var. latifolium DC. + + + Cichorium endivia var. latifolium + Cichorium + endivia + latifolium + + + DC. + + DC. + + DC. + + + + + 1805 + 68 + + + Cichorium endivia var. sativa DC. + + + Cichorium endivia var. sativa + Cichorium + endivia + sativa + + + DC. + + DC. + + DC. + + + + + 1838 + 84 + + + + Cichorium hybridum Heldr. ex Halácsy + + + Cichorium hybridum + Cichorium + hybridum + + + Heldr. ex Halácsy + + Heldr. ex Halácsy + + Halácsy + Heldr. + + + + + 1902 + 179 + + + Cichorium intybus L. + + + Cichorium intybus + Cichorium + intybus + + + L. + + L. + + L. + + + + + 1753 + 813 + + + + Cichorium glaucum Hoffmanns. & Link + + + Cichorium glaucum + Cichorium + glaucum + + + Hoffmanns. & Link + + Hoffmanns. & Link + + Hoffmanns. + Link + + + + + + 178 + + + Cichorium intybus subsp. glaucum (Hoffmanns. & Link) Tzvelev + + + Cichorium intybus subsp. glaucum + Cichorium + intybus + glaucum + + + (Hoffmanns. & Link) Tzvelev + + Hoffmanns. & Link + + Hoffmanns. + Link + + + + Tzvelev + + Tzvelev + + + + + 1964 + 29 + + + + Cichorium pumilum Jacq. + + + Cichorium pumilum + Cichorium + pumilum + + + Jacq. + + Jacq. + + Jacq. + + + + + 1771 + 3 + + + Cichorium spinosum L. + + + Cichorium spinosum + Cichorium + spinosum + + + L. + + L. + + L. + + + + + 1753 + 813 + + Lectotype (designated by Alavi 1983:322): Herb. Linn. No. 962.4 (LINN) + + + + Alavi in Jafri & El-Gadi, Fl. Libya 107. 1983 + 322 + + + + + + Acanthophyton spinosum (L.) Less. + + + Acanthophyton spinosum + Acanthophyton + spinosum + + + (L.) Less. + + L. + + L. + + + + Less. + + Less. + + + + + 1832 + 128 + + + + Cichorium intybus L. subsp. intybus + + + Cichorium intybus subsp. intybus + Cichorium + intybus + intybus + + + L. + + L. + + L. + + + + + 1753 + 813 + + + Cichorium intybus subsp. spicatum I. Ricci + + + Cichorium intybus subsp. spicatum + Cichorium + intybus + spicatum + + + I. Ricci + + I. Ricci + + I. Ricci + + + + + 2007 + 142 + + + + + + + EDIT Cichorieae + + + + EDIT Cichorieae + + + + + + + + + EDIT Cichorieae + + + + + + + + + EDIT Cichorieae + + + + + + + + + EDIT Cichorieae + + + + + + + + + EDIT Cichorieae + + + + + + + + + + + + + + + + + + + + + + EDIT Cichorieae + + + + EDIT Cichorieae + + + + EDIT Cichorieae + + + + EDIT Cichorieae + + + + EDIT Cichorieae + + + + + + + + + EDIT Cichorieae + + + + + + + + + + + + + + + + + + + + + + + + EDIT Cichorieae + + + Çikore + + Vangjeli, J., Flora e Shqipërisë 4. 1999 + + + + Kore + + Vangjeli, J., Flora e Shqipërisë 4. 1999 + + + + هِنْدَبا بَرِّيَّة + + Nehmé, M., Dictionnaire Etymologique de la Flore du Liban. 2000 + + + + هِنْدَبا بَرِّيَّة + + Nehmé, M., Etymological Dictionary of Syrian Flora. 2008 + + + + + + EDIT Cichorieae + + + + + + + + + EDIT Cichorieae + + + + + + + + + EDIT Cichorieae + + + + + + + + + EDIT Cichorieae + + + + + + + + diff --git a/app-import/src/main/resources/tcsXmlTest.xml b/app-import/src/main/resources/tcs/tcsXmlTest.xml similarity index 100% rename from app-import/src/main/resources/tcsXmlTest.xml rename to app-import/src/main/resources/tcs/tcsXmlTest.xml