(no commit message)

diff --git a/.gitattributes b/.gitattributes
index d030f067525700660440c0029c740fea99f22dd0..4f7741cd7bebf02201dd6e20858c6936477aff19 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -279,7 +279,7 @@ cdmlibrary/src/main/resources/terms/README.TXT -text
 cdmlibrary/src/main/resources/terms/Rank.csv -text
 cdmlibrary/src/main/resources/terms/SynonymRelationshipType.csv -text
 cdmlibrary/src/main/resources/terms/TypeDesignationStatus.csv -text
-cdmlibrary/src/main/resources/terms/WaterbodiesAndCountries.csv -text
+cdmlibrary/src/main/resources/terms/WaterbodyOrCountry.csv -text
 cdmlibrary/src/site/site.xml -text
 cdmlibrary/src/test/java/eu/etaxonomy/cdm/aspectj/PropertyChangeTest.java -text
 cdmlibrary/src/test/java/eu/etaxonomy/cdm/database/DatabaseEnumTest.java -text

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java
index 2cb4dc5c51e29d4d5467c84770d7e05feb466eeb..b977d0ee21dabdd0fca323f0de1d16b9bfa3e215 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java
@@ -59,9 +59,11 @@ public abstract class DefinedTermBase extends TermBase implements IDefTerm{
         * @see eu.etaxonomy.cdm.model.common.IDefTerm#readCsvLine(java.util.List)
         */
        public void readCsvLine(List<String> csvLine) {
-               this.addRepresentation(new Representation(csvLine.get(1).trim(), csvLine.get(1).trim(), Language.DEFAULT()) );
-               logger.debug("Created "+this.getClass().getSimpleName() + " term: "+this.toString());
+               this.setUuid(csvLine.get(0));
+               this.setUri(csvLine.get(1));
+               this.addRepresentation(new Representation(csvLine.get(3), csvLine.get(2).trim(), Language.ENGLISH()) );
        }
+
        /* (non-Javadoc)
         * @see eu.etaxonomy.cdm.model.common.IDefTerm#writeCsvLine(au.com.bytecode.opencsv.CSVWriter)
         */

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Language.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Language.java
index f96401dcd6b8ecff185811f0c3cc643f193fe750..45e0f3c6b272b4d468dcbde45c9b81543480e5cb 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Language.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Language.java
@@ -104,21 +104,20 @@ public class Language extends DefinedTermBase {
 
        
        public void readCsvLine(List<String> csvLine) {
-               this.iso639_1=csvLine.get(0).trim().toCharArray();
-               this.iso639_2=csvLine.get(2).trim().toCharArray();
-               this.addRepresentation(new Representation(csvLine.get(3).trim(), String.valueOf(iso639_2), Language.ENGLISH()));
-               this.addRepresentation(new Representation(csvLine.get(4).trim(), String.valueOf(iso639_2), Language.FRENCH()));
-               logger.debug("Created "+this.getClass().getSimpleName() + " term: "+this.toString());
+               // read UUID, URI, english label+description
+               super.readCsvLine(csvLine);
+               // iso codes extra
+               this.iso639_1=csvLine.get(4).trim().toCharArray();
+               this.iso639_2=csvLine.get(5).trim().toCharArray();
        }
        public void writeCsvLine(CSVWriter writer) {
-               String [] line = new String[7];
+               String [] line = new String[6];
                line[0] = getUuid();
                line[1] = getUri();
                line[2] = getLabel(Language.ENGLISH());
-               line[3] = getDescription();
-               line[4] = getLabel(Language.FRENCH());
-               line[5] = String.valueOf(this.iso639_1);
-               line[6] = String.valueOf(this.iso639_2);
+               line[3] = getDescription(Language.ENGLISH());
+               line[4] = String.valueOf(this.iso639_1);
+               line[5] = String.valueOf(this.iso639_2);
                writer.writeNext(line);
        }
        

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/RelationshipTermBase.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/RelationshipTermBase.java
index 4de317b6dcc3d8691722cc55b9b690eadc68d122..e8d918de0e9ca53f109ac530b62d76d31fd78a5a 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/RelationshipTermBase.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/RelationshipTermBase.java
@@ -130,15 +130,12 @@ public abstract class RelationshipTermBase extends OrderedTermBase {
        }
        
        public void readCsvLine(List<String> csvLine) {
-               if(csvLine.get(3).trim().length()>0){
-                       this.symmetric=true;
-               }
-               if(csvLine.get(4).trim().length()>0){
-                       this.transitive=true;
-               }
-               this.addRepresentation(new Representation(csvLine.get(1).trim(), csvLine.get(1).trim(), Language.DEFAULT()) );
-               this.addInverseRepresentation(new Representation(csvLine.get(2).trim(), csvLine.get(2).trim(), Language.DEFAULT()) );
-               logger.debug("Created "+this.getClass().getSimpleName() + " term: "+this.toString());
+               // read UUID, URI, english label+description
+               super.readCsvLine(csvLine);
+               // inverse label + 2 booleans
+               this.addInverseRepresentation(new Representation(csvLine.get(4).trim(), csvLine.get(5).trim(), Language.ENGLISH()) );
+               this.setSymmetric(Boolean.parseBoolean(csvLine.get(6)));
+               this.setTransitive(Boolean.parseBoolean(csvLine.get(7)));
        }
        
        public void writeCsvLine(CSVWriter writer) {

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/WaterbodyOrCountry.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/WaterbodyOrCountry.java
index 75fb72630a4326ea8365d3518a7533ab8a6fdb98..40d72cfa6fa7b2424e3bb80319e830a88b3b3229 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/WaterbodyOrCountry.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/WaterbodyOrCountry.java
@@ -128,8 +128,10 @@ public class WaterbodyOrCountry extends DefinedTermBase {
 
        
        public void readCsvLine(List<String> csvLine) {
-               this.iso2code=csvLine.get(0).trim();
-               this.addRepresentation(new Representation(csvLine.get(3).trim(), csvLine.get(1).trim(), Language.ENGLISH()));
+               // read UUID, URI, english label+description
+               super.readCsvLine(csvLine);
+               // iso codes extra
+               this.iso2code=csvLine.get(4).trim();
        }
        public void writeCsvLine(CSVWriter writer) {
                String [] line = new String[6];

diff --git a/cdmlibrary/src/main/resources/terms/WaterbodiesAndCountries.csv b/cdmlibrary/src/main/resources/terms/WaterbodiesAndCountries.csv
deleted file mode 100644 (file)
index 638bcbc..0000000
--- a/cdmlibrary/src/main/resources/terms/WaterbodiesAndCountries.csv
+++ /dev/null
@@ -1,239 +0,0 @@
-AF     AFG     004     Afghanistan
-AL     ALB     008     Albania, People's Socialist Republic of
-DZ     DZA     012     Algeria, People's Democratic Republic of
-AS     ASM     016     American Samoa
-AD     AND     020     Andorra, Principality of
-AO     AGO     024     Angola, Republic of
-AI     AIA     660     Anguilla
-AQ     ATA     010     Antarctica (the territory South of 60 deg S)
-AG     ATG     028     Antigua and Barbuda
-AR     ARG     032     Argentina, Argentine Republic
-AM     ARM     051     Armenia
-AW     ABW     533     Aruba
-AU     AUS     036     Australia, Commonwealth of
-AT     AUT     040     Austria, Republic of
-AZ     AZE     031     Azerbaijan, Republic of
-BS     BHS     044     Bahamas, Commonwealth of the
-BH     BHR     048     Bahrain, Kingdom of
-BD     BGD     050     Bangladesh, People's Republic of
-BB     BRB     052     Barbados
-BY     BLR     112     Belarus
-BE     BEL     056     Belgium, Kingdom of
-BZ     BLZ     084     Belize
-BJ     BEN     204     Benin, People's Republic of
-BM     BMU     060     Bermuda
-BT     BTN     064     Bhutan, Kingdom of
-BO     BOL     068     Bolivia, Republic of
-BA     BIH     070     Bosnia and Herzegovina
-BW     BWA     072     Botswana, Republic of
-BV     BVT     074     Bouvet Island (Bouvetoya)
-BR     BRA     076     Brazil, Federative Republic of
-IO     IOT     086     British Indian Ocean Territory (Chagos Archipelago)
-VG     VGB     092     British Virgin Islands
-BN     BRN     096     Brunei Darussalam
-BG     BGR     100     Bulgaria, People's Republic of
-BF     BFA     854     Burkina Faso
-BI     BDI     108     Burundi, Republic of
-KH     KHM     116     Cambodia, Kingdom of
-CM     CMR     120     Cameroon, United Republic of
-CA     CAN     124     Canada
-CV     CPV     132     Cape Verde, Republic of
-KY     CYM     136     Cayman Islands
-CF     CAF     140     Central African Republic
-TD     TCD     148     Chad, Republic of
-CL     CHL     152     Chile, Republic of
-CN     CHN     156     China, People's Republic of
-CX     CXR     162     Christmas Island
-CC     CCK     166     Cocos (Keeling) Islands
-CO     COL     170     Colombia, Republic of
-KM     COM     174     Comoros, Union of the
-CD     COD     180     Congo, Democratic Republic of
-CG     COG     178     Congo, People's Republic of
-CK     COK     184     Cook Islands
-CR     CRI     188     Costa Rica, Republic of
-CI     CIV     384     Cote D'Ivoire, Ivory Coast, Republic of the
-CU     CUB     192     Cuba, Republic of
-CY     CYP     196     Cyprus, Republic of
-CZ     CZE     203     Czech Republic
-DK     DNK     208     Denmark, Kingdom of
-DJ     DJI     262     Djibouti, Republic of
-DM     DMA     212     Dominica, Commonwealth of
-DO     DOM     214     Dominican Republic
-EC     ECU     218     Ecuador, Republic of
-EG     EGY     818     Egypt, Arab Republic of
-SV     SLV     222     El Salvador, Republic of
-GQ     GNQ     226     Equatorial Guinea, Republic of
-ER     ERI     232     Eritrea
-EE     EST     233     Estonia
-ET     ETH     231     Ethiopia
-FO     FRO     234     Faeroe Islands
-FK     FLK     238     Falkland Islands (Malvinas)
-FJ     FJI     242     Fiji, Republic of the Fiji Islands
-FI     FIN     246     Finland, Republic of
-FR     FRA     250     France, French Republic
-GF     GUF     254     French Guiana
-PF     PYF     258     French Polynesia
-TF     ATF     260     French Southern Territories
-GA     GAB     266     Gabon, Gabonese Republic
-GM     GMB     270     Gambia, Republic of the
-GE     GEO     268     Georgia
-DE     DEU     276     Germany
-GH     GHA     288     Ghana, Republic of
-GI     GIB     292     Gibraltar
-GR     GRC     300     Greece, Hellenic Republic
-GL     GRL     304     Greenland
-GD     GRD     308     Grenada
-GP     GLP     312     Guadaloupe
-GU     GUM     316     Guam
-GT     GTM     320     Guatemala, Republic of
-GN     GIN     324     Guinea, Revolutionary People's Rep'c of
-GW     GNB     624     Guinea-Bissau, Republic of
-GY     GUY     328     Guyana, Republic of
-HT     HTI     332     Haiti, Republic of
-HM     HMD     334     Heard and McDonald Islands
-VA     VAT     336     Holy See (Vatican City State)
-HN     HND     340     Honduras, Republic of
-HK     HKG     344     Hong Kong, Special Administrative Region of China
-HR     HRV     191     Hrvatska (Croatia)
-HU     HUN     348     Hungary, Hungarian People's Republic
-IS     ISL     352     Iceland, Republic of
-IN     IND     356     India, Republic of
-ID     IDN     360     Indonesia, Republic of
-IR     IRN     364     Iran, Islamic Republic of
-IQ     IRQ     368     Iraq, Republic of
-IE     IRL     372     Ireland
-IL     ISR     376     Israel, State of
-IT     ITA     380     Italy, Italian Republic
-JM     JAM     388     Jamaica
-JP     JPN     392     Japan
-JO     JOR     400     Jordan, Hashemite Kingdom of
-KZ     KAZ     398     Kazakhstan, Republic of
-KE     KEN     404     Kenya, Republic of
-KI     KIR     296     Kiribati, Republic of
-KP     PRK     408     Korea, Democratic People's Republic of
-KR     KOR     410     Korea, Republic of
-KW     KWT     414     Kuwait, State of
-KG     KGZ     417     Kyrgyz Republic
-LA     LAO     418     Lao People's Democratic Republic
-LV     LVA     428     Latvia
-LB     LBN     422     Lebanon, Lebanese Republic
-LS     LSO     426     Lesotho, Kingdom of
-LR     LBR     430     Liberia, Republic of
-LY     LBY     434     Libyan Arab Jamahiriya
-LI     LIE     438     Liechtenstein, Principality of
-LT     LTU     440     Lithuania
-LU     LUX     442     Luxembourg, Grand Duchy of
-MO     MAC     446     Macao, Special Administrative Region of China
-MK     MKD     807     Macedonia, the former Yugoslav Republic of
-MG     MDG     450     Madagascar, Republic of
-MW     MWI     454     Malawi, Republic of
-MY     MYS     458     Malaysia
-MV     MDV     462     Maldives, Republic of
-ML     MLI     466     Mali, Republic of
-MT     MLT     470     Malta, Republic of
-MH     MHL     584     Marshall Islands
-MQ     MTQ     474     Martinique
-MR     MRT     478     Mauritania, Islamic Republic of
-MU     MUS     480     Mauritius
-YT     MYT     175     Mayotte
-MX     MEX     484     Mexico, United Mexican States
-FM     FSM     583     Micronesia, Federated States of
-MD     MDA     498     Moldova, Republic of
-MC     MCO     492     Monaco, Principality of
-MN     MNG     496     Mongolia, Mongolian People's Republic
-MS     MSR     500     Montserrat
-MA     MAR     504     Morocco, Kingdom of
-MZ     MOZ     508     Mozambique, People's Republic of
-MM     MMR     104     Myanmar
-NA     NAM     516     Namibia
-NR     NRU     520     Nauru, Republic of
-NP     NPL     524     Nepal, Kingdom of
-AN     ANT     530     Netherlands Antilles
-NL     NLD     528     Netherlands, Kingdom of the
-NC     NCL     540     New Caledonia
-NZ     NZL     554     New Zealand
-NI     NIC     558     Nicaragua, Republic of
-NE     NER     562     Niger, Republic of the
-NG     NGA     566     Nigeria, Federal Republic of
-NU     NIU     570     Niue, Republic of
-NF     NFK     574     Norfolk Island
-MP     MNP     580     Northern Mariana Islands
-NO     NOR     578     Norway, Kingdom of
-OM     OMN     512     Oman, Sultanate of
-PK     PAK     586     Pakistan, Islamic Republic of
-PW     PLW     585     Palau
-PS     PSE     275     Palestinian Territory, Occupied
-PA     PAN     591     Panama, Republic of
-PG     PNG     598     Papua New Guinea
-PY     PRY     600     Paraguay, Republic of
-PE     PER     604     Peru, Republic of
-PH     PHL     608     Philippines, Republic of the
-PN     PCN     612     Pitcairn Island
-PL     POL     616     Poland, Polish People's Republic
-PT     PRT     620     Portugal, Portuguese Republic
-PR     PRI     630     Puerto Rico
-QA     QAT     634     Qatar, State of
-RE     REU     638     Reunion
-RO     ROU     642     Romania, Socialist Republic of
-RU     RUS     643     Russian Federation
-RW     RWA     646     Rwanda, Rwandese Republic
-SH     SHN     654     St. Helena
-KN     KNA     659     St. Kitts and Nevis
-LC     LCA     662     St. Lucia
-PM     SPM     666     St. Pierre and Miquelon
-VC     VCT     670     St. Vincent and the Grenadines
-WS     WSM     882     Samoa, Independent State of
-SM     SMR     674     San Marino, Republic of
-ST     STP     678     Sao Tome and Principe, Democratic Republic of
-SA     SAU     682     Saudi Arabia, Kingdom of
-SN     SEN     686     Senegal, Republic of
-CS     SCG     891     Serbia and Montenegro
-SC     SYC     690     Seychelles, Republic of
-SL     SLE     694     Sierra Leone, Republic of
-SG     SGP     702     Singapore, Republic of
-SK     SVK     703     Slovakia (Slovak Republic)
-SI     SVN     705     Slovenia
-SB     SLB     090     Solomon Islands
-SO     SOM     706     Somalia, Somali Republic
-ZA     ZAF     710     South Africa, Republic of
-GS     SGS     239     South Georgia and the South Sandwich Islands
-ES     ESP     724     Spain, Spanish State
-LK     LKA     144     Sri Lanka, Democratic Socialist Republic of
-SD     SDN     736     Sudan, Democratic Republic of the
-SR     SUR     740     Suriname, Republic of
-SJ     SJM     744     Svalbard & Jan Mayen Islands
-SZ     SWZ     748     Swaziland, Kingdom of
-SE     SWE     752     Sweden, Kingdom of
-CH     CHE     756     Switzerland, Swiss Confederation
-SY     SYR     760     Syrian Arab Republic
-TW     TWN     158     Taiwan, Province of China
-TJ     TJK     762     Tajikistan
-TZ     TZA     834     Tanzania, United Republic of
-TH     THA     764     Thailand, Kingdom of
-TL     TLS     626     Timor-Leste, Democratic Republic of
-TG     TGO     768     Togo, Togolese Republic
-TK     TKL     772     Tokelau (Tokelau Islands)
-TO     TON     776     Tonga, Kingdom of
-TT     TTO     780     Trinidad and Tobago, Republic of
-TN     TUN     788     Tunisia, Republic of
-TR     TUR     792     Turkey, Republic of
-TM     TKM     795     Turkmenistan
-TC     TCA     796     Turks and Caicos Islands
-TV     TUV     798     Tuvalu
-VI     VIR     850     US Virgin Islands
-UG     UGA     800     Uganda, Republic of
-UA     UKR     804     Ukraine
-AE     ARE     784     United Arab Emirates
-GB     GBR     826     United Kingdom of Great Britain & N. Ireland
-UM     UMI     581     United States Minor Outlying Islands
-US     USA     840     United States of America
-UY     URY     858     Uruguay, Eastern Republic of
-UZ     UZB     860     Uzbekistan
-VU     VUT     548     Vanuatu
-VE     VEN     862     Venezuela, Bolivarian Republic of
-VN     VNM     704     Viet Nam, Socialist Republic of
-WF     WLF     876     Wallis and Futuna Islands
-EH     ESH     732     Western Sahara
-YE     YEM     887     Yemen
-ZM     ZMB     894     Zambia, Republic of
-ZW     ZWE     716     Zimbabwe
\ No newline at end of file

diff --git a/cdmlibrary/src/main/resources/terms/WaterbodyOrCountry.csv b/cdmlibrary/src/main/resources/terms/WaterbodyOrCountry.csv
new file mode 100644 (file)
index 0000000..37f0c5c
--- /dev/null
+++ b/cdmlibrary/src/main/resources/terms/WaterbodyOrCountry.csv
@@ -0,0 +1,239 @@
+"974ce01a-5bce-4be8-b728-a46869354960",,"AFG","Afghanistan","AF","[]"
+"238a6a93-8857-4fd6-af9e-6437c90817ac",,"ALB","Albania, People's Socialist Republic of","AL","[]"
+"a14b38ac-e963-4c1a-85c2-de1f17f8c72a",,"DZA","Algeria, People's Democratic Republic of","DZ","[]"
+"4a071803-88aa-4367-9707-bb1f24ad4386",,"ASM","American Samoa","AS","[]"
+"7efd738f-33a1-4969-9d49-552571ffe935",,"AND","Andorra, Principality of","AD","[]"
+"c48ca5e4-154a-46d6-af29-f722486bedba",,"AGO","Angola, Republic of","AO","[]"
+"4a3b7f0d-0ff5-4691-a232-a2dc43ad4c56",,"AIA","Anguilla","AI","[]"
+"36aea55c-5d4c-4015-bb70-f15d9280c805",,"ATA","Antarctica (the territory South of 60 deg S)","AQ","[]"
+"fe425b94-f0e2-4e20-9e08-f28d53016347",,"ATG","Antigua and Barbuda","AG","[]"
+"ee0a4820-914d-424c-8133-57efb3028741",,"ARG","Argentina, Argentine Republic","AR","[]"
+"7c685229-ce21-4dfd-a2c7-0932003f14ef",,"ARM","Armenia","AM","[]"
+"f5a9fc99-52d5-4a54-9859-edede22cb39d",,"ABW","Aruba","AW","[]"
+"c22658e2-b1a9-4f4c-9ccd-affe0255efc8",,"AUS","Australia, Commonwealth of","AU","[]"
+"dfeb9102-7101-41cb-9449-bf5eae83cb5b",,"AUT","Austria, Republic of","AT","[]"
+"5189a180-f4ef-4a8a-9e90-36977c351960",,"AZE","Azerbaijan, Republic of","AZ","[]"
+"8b6851bf-b82e-4114-a99f-9b40ce0f3b2c",,"BHS","Bahamas, Commonwealth of the","BS","[]"
+"7f7e8c06-a804-4efa-b02f-7679f929a760",,"BHR","Bahrain, Kingdom of","BH","[]"
+"89752d76-d03a-46e1-9763-cc089f8a8e53",,"BGD","Bangladesh, People's Republic of","BD","[]"
+"c870ad88-4393-4e76-a37d-39656c5d7ff2",,"BRB","Barbados","BB","[]"
+"66872923-5ae7-48be-b669-d9a2b7e4663c",,"BLR","Belarus","BY","[]"
+"fa27fe27-4966-4381-a341-3535f2b4309e",,"BEL","Belgium, Kingdom of","BE","[]"
+"6c3eeed7-00eb-4aa3-8e3c-2d8bc25f3338",,"BLZ","Belize","BZ","[]"
+"e6875306-892c-43d0-9aaa-9ac26e5d6551",,"BEN","Benin, People's Republic of","BJ","[]"
+"88f4017e-27dc-4828-a2d7-0cf0637f1a7b",,"BMU","Bermuda","BM","[]"
+"35d9b61f-15d6-453d-8b01-8c786da241b3",,"BTN","Bhutan, Kingdom of","BT","[]"
+"8a18a774-0072-4678-8746-43de9ee066c4",,"BOL","Bolivia, Republic of","BO","[]"
+"368be113-c0f2-444c-939c-65b544d19702",,"BIH","Bosnia and Herzegovina","BA","[]"
+"e00464af-d38e-4cd5-b5fe-50b27eace4ee",,"BWA","Botswana, Republic of","BW","[]"
+"65fa17a7-efa7-4be5-9d51-8b261c5217b7",,"BVT","Bouvet Island (Bouvetoya)","BV","[]"
+"dccbe7f8-d5e3-48e5-bcbb-96886eb7108a",,"BRA","Brazil, Federative Republic of","BR","[]"
+"996f912c-971f-40cb-88a4-1575226415b9",,"IOT","British Indian Ocean Territory (Chagos Archipelago)","IO","[]"
+"5b71a5a2-0551-4563-b0aa-8aa259b90979",,"VGB","British Virgin Islands","VG","[]"
+"7e6247b5-4145-454b-ad51-b60809a8a939",,"BRN","Brunei Darussalam","BN","[]"
+"51ddedf0-4646-46ba-9840-ab5513eec455",,"BGR","Bulgaria, People's Republic of","BG","[]"
+"c4b22384-e26f-4a44-b641-64208f72ea25",,"BFA","Burkina Faso","BF","[]"
+"0d584b61-15b9-41fa-8cec-242f1f094417",,"BDI","Burundi, Republic of","BI","[]"
+"485a4988-a3dd-43b8-9c18-e0351618056a",,"KHM","Cambodia, Kingdom of","KH","[]"
+"30ba95a0-a951-46a0-aa67-e539475d4386",,"CMR","Cameroon, United Republic of","CM","[]"
+"5dc3dc6f-3816-44b3-b661-a4cf1528bae7",,"CAN","Canada","CA","[]"
+"083ff0fc-9eea-4f1b-80c0-f203bd2890b8",,"CPV","Cape Verde, Republic of","CV","[]"
+"23264b59-fcc9-47a0-9f69-30a98757c121",,"CYM","Cayman Islands","KY","[]"
+"40d7ffa6-11cc-417c-adf7-f4acc03cca20",,"CAF","Central African Republic","CF","[]"
+"d1ea5922-6bd2-4c63-b49a-259207c584a4",,"TCD","Chad, Republic of","TD","[]"
+"9c41644f-4946-4586-b2a4-c8ec33dbe68b",,"CHL","Chile, Republic of","CL","[]"
+"e0ed33bb-4afe-4994-81f3-b5f91655ff62",,"CHN","China, People's Republic of","CN","[]"
+"e785a72e-2b51-42b9-bea0-888924906b3e",,"CXR","Christmas Island","CX","[]"
+"0994e57b-a0fa-4597-9098-8815235e9053",,"CCK","Cocos (Keeling) Islands","CC","[]"
+"cd334393-328c-4fb7-9600-bdca44c224d6",,"COL","Colombia, Republic of","CO","[]"
+"3b52601e-e85f-415c-bc36-acc45717107f",,"COM","Comoros, Union of the","KM","[]"
+"5a70a5b8-7264-48f1-b552-6fde52ae43f7",,"COD","Congo, Democratic Republic of","CD","[]"
+"5c0a6d1d-f5c1-4c92-b3cd-9a1c0cd0d9dc",,"COG","Congo, People's Republic of","CG","[]"
+"72f5df8d-ff1c-44af-9444-e368d770f36f",,"COK","Cook Islands","CK","[]"
+"aca508c7-2d49-4760-83cb-93b6ccce6751",,"CRI","Costa Rica, Republic of","CR","[]"
+"5a6673d7-1580-4470-974c-b36c4584247f",,"CIV","Cote D'Ivoire, Ivory Coast, Republic of the","CI","[]"
+"229f0575-9035-4738-8741-f131cad59107",,"CUB","Cuba, Republic of","CU","[]"
+"4b13d6b8-7eca-4d42-8172-f2018051ca19",,"CYP","Cyprus, Republic of","CY","[]"
+"56ee8c08-506d-4c27-9c31-db5344356ea3",,"CZE","Czech Republic","CZ","[]"
+"dbf70b64-a47e-4339-ae07-828f9ff2b7d8",,"DNK","Denmark, Kingdom of","DK","[]"
+"8c80ca2b-e6e6-46bc-9f35-978a1a078a55",,"DJI","Djibouti, Republic of","DJ","[]"
+"c8ef3805-69dd-4e84-ab69-c813252910dd",,"DMA","Dominica, Commonwealth of","DM","[]"
+"1c2084e4-38cc-41d1-9d33-0360fed7c55d",,"DOM","Dominican Republic","DO","[]"
+"e396160a-3554-4da8-ad40-cd7137c021d7",,"ECU","Ecuador, Republic of","EC","[]"
+"3c4a2a5a-d3d7-4c82-a28f-2feaa7050c04",,"EGY","Egypt, Arab Republic of","EG","[]"
+"2706e84c-a57d-40ab-aee4-dce25fe89211",,"SLV","El Salvador, Republic of","SV","[]"
+"7d0cee2b-086a-465e-afc3-0216bff7fd19",,"GNQ","Equatorial Guinea, Republic of","GQ","[]"
+"8394a73d-a0c6-481c-8e86-e05705891fac",,"ERI","Eritrea","ER","[]"
+"b442614f-5bfa-4583-b87b-7c7c856015f1",,"EST","Estonia","EE","[]"
+"8866fa09-8ee2-4957-ad86-4e622085ef40",,"ETH","Ethiopia","ET","[]"
+"0b2933ea-cee6-4611-b52b-09d6fcdbcf9d",,"FRO","Faeroe Islands","FO","[]"
+"8c667c52-70b6-447a-b4f2-dfa2d759d5f6",,"FLK","Falkland Islands (Malvinas)","FK","[]"
+"8a83a1e5-b648-4cea-86cd-7affaea817a7",,"FJI","Fiji, Republic of the Fiji Islands","FJ","[]"
+"47bbb4b3-6f18-46f9-9eb6-6ec92c41fe84",,"FIN","Finland, Republic of","FI","[]"
+"4c49d9d3-6bc3-481a-93c6-c8156cba25fe",,"FRA","France, French Republic","FR","[]"
+"38ba5ec2-913b-4894-a5bf-d55f3bd9d7a0",,"GUF","French Guiana","GF","[]"
+"7dadc5d4-d4e8-4ad6-bfa4-e8498a706778",,"PYF","French Polynesia","PF","[]"
+"590663d7-1b7e-4088-9407-2a589eb73fd4",,"ATF","French Southern Territories","TF","[]"
+"d285a9f8-4349-4428-a848-c9aa45c4c8ab",,"GAB","Gabon, Gabonese Republic","GA","[]"
+"3dcc7fea-7785-4254-9947-f724e27a76fc",,"GMB","Gambia, Republic of the","GM","[]"
+"af3f8bd9-1f5e-42cf-a0cc-f9199ab1bb89",,"GEO","Georgia","GE","[]"
+"cbe7ce69-2952-4309-85dd-0d7d4a4830a1",,"DEU","Germany","DE","[]"
+"d4cf6c57-98ee-43b8-8d92-b510371dd151",,"GHA","Ghana, Republic of","GH","[]"
+"46764ae0-2d8d-461e-89d0-a1953edef02f",,"GIB","Gibraltar","GI","[]"
+"5b7c78d1-f068-4c4d-b2c9-9ac075b7169a",,"GRC","Greece, Hellenic Republic","GR","[]"
+"34bbe398-e0da-40bd-b16b-34a2e9fd3cc2",,"GRL","Greenland","GL","[]"
+"dda637e3-7742-4faf-bc05-e5d2c2d86a52",,"GRD","Grenada","GD","[]"
+"2559330d-f79b-4273-b6db-e47abce1de6c",,"GLP","Guadaloupe","GP","[]"
+"264c71d7-91ef-4a5e-9ae6-49aac2a6ba3a",,"GUM","Guam","GU","[]"
+"54040dec-6f42-48cc-93d8-8b283b23e530",,"GTM","Guatemala, Republic of","GT","[]"
+"1b3cf756-b0c2-4e14-88af-d260b937d01f",,"GIN","Guinea, Revolutionary People's Rep'c of","GN","[]"
+"2dbf1dc1-7428-4284-9090-8785a30f4e71",,"GNB","Guinea-Bissau, Republic of","GW","[]"
+"9cbe3428-0cfe-420e-a88e-eac196a16a37",,"GUY","Guyana, Republic of","GY","[]"
+"f1071b42-0247-4c4d-92a5-8bdf18099c50",,"HTI","Haiti, Republic of","HT","[]"
+"646a16d4-4a1f-47a0-a475-a19c605e04e0",,"HMD","Heard and McDonald Islands","HM","[]"
+"afebd310-0c8d-4601-b025-a06a1d195035",,"VAT","Holy See (Vatican City State)","VA","[]"
+"c6684b89-3ea6-4922-9148-d74ff3ee33fd",,"HND","Honduras, Republic of","HN","[]"
+"5aa1c98c-9efd-443f-9c10-708f175d5cea",,"HKG","Hong Kong, Special Administrative Region of China","HK","[]"
+"a3acb45e-39ec-476b-bff2-7ff7e0383f7e",,"HRV","Hrvatska (Croatia)","HR","[]"
+"4d8b56d0-ab74-437f-98e0-3b88ebaa8c89",,"HUN","Hungary, Hungarian People's Republic","HU","[]"
+"c7bf91f8-024c-4c04-9c0b-856a27b2d0ca",,"ISL","Iceland, Republic of","IS","[]"
+"a0b872f9-fc04-440d-ace3-edce8ea75e0b",,"IND","India, Republic of","IN","[]"
+"96eb663a-61b1-4a44-9017-0c4b1ea024d6",,"IDN","Indonesia, Republic of","ID","[]"
+"14f148e0-a9cf-428d-a244-a9917aae974d",,"IRN","Iran, Islamic Republic of","IR","[]"
+"daf3de07-b1b8-47fa-8207-7e237ea30b7f",,"IRQ","Iraq, Republic of","IQ","[]"
+"376f61f8-6234-4e61-bc5e-d0d76393cfa0",,"IRL","Ireland","IE","[]"
+"4c61dc3f-978d-4df9-9bd9-65089ee01dae",,"ISR","Israel, State of","IL","[]"
+"9404a588-503b-4033-acf5-ee4a47337ed0",,"ITA","Italy, Italian Republic","IT","[]"
+"528bede6-26db-47e6-b6cb-32f77ab5fef7",,"JAM","Jamaica","JM","[]"
+"a8be059a-6f1a-45aa-8019-f6bc3b81c691",,"JPN","Japan","JP","[]"
+"533b9709-1f97-43e6-8e12-68e116675c64",,"JOR","Jordan, Hashemite Kingdom of","JO","[]"
+"3047567d-997d-491a-b0bc-d4b287f76fab",,"KAZ","Kazakhstan, Republic of","KZ","[]"
+"9410b793-43fa-4205-bd24-5f92d392667f",,"KEN","Kenya, Republic of","KE","[]"
+"d46f42ec-a520-49d8-ac87-cc8bccc91516",,"KIR","Kiribati, Republic of","KI","[]"
+"0f2068a7-e284-417d-87ec-691c1e64c13c",,"PRK","Korea, Democratic People's Republic of","KP","[]"
+"f81e0bbb-8984-431e-9962-de590a989fd3",,"KOR","Korea, Republic of","KR","[]"
+"00451db7-4f5a-4e5d-a6fe-955a8af306a0",,"KWT","Kuwait, State of","KW","[]"
+"fc3cb838-98f0-46b4-a5fe-5efafc121e95",,"KGZ","Kyrgyz Republic","KG","[]"
+"83b736b4-5049-4301-b370-ba19e7aa0403",,"LAO","Lao People's Democratic Republic","LA","[]"
+"c24a316c-cec1-47c2-a777-296ce67ce11a",,"LVA","Latvia","LV","[]"
+"425b9cd2-0056-484a-9f77-5449215c65ba",,"LBN","Lebanon, Lebanese Republic","LB","[]"
+"fbbbc46c-ed8f-45f5-87bc-062a7ee7ffdf",,"LSO","Lesotho, Kingdom of","LS","[]"
+"f40126ab-4cbe-409e-8f61-8911280e0857",,"LBR","Liberia, Republic of","LR","[]"
+"b9115908-2937-45e3-8fb3-009136b013af",,"LBY","Libyan Arab Jamahiriya","LY","[]"
+"1bb6cf13-1286-40c8-bff8-1a18ef65e213",,"LIE","Liechtenstein, Principality of","LI","[]"
+"3a2a0f69-92b1-45ab-baa8-47cf48e7272b",,"LTU","Lithuania","LT","[]"
+"5c481573-3d28-4c2c-87e1-acee4ccc64f1",,"LUX","Luxembourg, Grand Duchy of","LU","[]"
+"927f5ae3-8d26-4794-9e5d-95cf9e0dfd03",,"MAC","Macao, Special Administrative Region of China","MO","[]"
+"1cf135bb-cac7-4ba9-82dc-319ee41984c5",,"MKD","Macedonia, the former Yugoslav Republic of","MK","[]"
+"116be5e1-861e-4283-8689-f527a923b9d3",,"MDG","Madagascar, Republic of","MG","[]"
+"61b41230-6365-433f-9454-5fea029f0e02",,"MWI","Malawi, Republic of","MW","[]"
+"5650de95-a90c-45c1-92bf-85d9b91911dd",,"MYS","Malaysia","MY","[]"
+"5b932d64-3ca6-4691-881f-8b48bd2f3f15",,"MDV","Maldives, Republic of","MV","[]"
+"2e201266-8535-4437-8870-a1d63745ec3d",,"MLI","Mali, Republic of","ML","[]"
+"0ee9727a-36cb-40cb-9e65-cd4646c09d63",,"MLT","Malta, Republic of","MT","[]"
+"2c507bb4-de73-4e3f-98ce-26bd2b0c016a",,"MHL","Marshall Islands","MH","[]"
+"93ec114a-0486-4325-bef8-d1b5dea89419",,"MTQ","Martinique","MQ","[]"
+"dfd0aaf0-4a73-4d41-a6d7-9cdfd01f4c40",,"MRT","Mauritania, Islamic Republic of","MR","[]"
+"719daa07-1dce-4473-8c40-b0efd644028c",,"MUS","Mauritius","MU","[]"
+"48116e69-19a9-4169-9952-4ca46c586fa2",,"MYT","Mayotte","YT","[]"
+"4ba4809b-3fa8-496d-a74d-80843a4740c8",,"MEX","Mexico, United Mexican States","MX","[]"
+"70a91b6f-f196-4051-afdb-4e9aeaca490d",,"FSM","Micronesia, Federated States of","FM","[]"
+"500f43b9-47c4-4c2a-af58-80adbc40c5f3",,"MDA","Moldova, Republic of","MD","[]"
+"4ef4c6cb-e02c-41a3-8d5f-74e8ae09ca71",,"MCO","Monaco, Principality of","MC","[]"
+"8b7ebb83-9998-4efd-b97c-f1b7d3a7151f",,"MNG","Mongolia, Mongolian People's Republic","MN","[]"
+"cd64d76f-6f2b-4e44-8d31-a2765100257b",,"MSR","Montserrat","MS","[]"
+"d9c048d5-3220-439d-8af4-2a8ec3036e5b",,"MAR","Morocco, Kingdom of","MA","[]"
+"9f2b714e-6159-401b-9108-5d0b9413f6c8",,"MOZ","Mozambique, People's Republic of","MZ","[]"
+"fd07e660-b3d6-46e7-bf7d-ec984e573c60",,"MMR","Myanmar","MM","[]"
+"2c361180-c71c-4de0-8a98-0ff5a71bccaa",,"NAM","Namibia","NA","[]"
+"35d8c1ce-a2e9-43d6-9afe-582278a53d34",,"NRU","Nauru, Republic of","NR","[]"
+"fa46cd94-68f9-4d0d-98a2-27dc6589658f",,"NPL","Nepal, Kingdom of","NP","[]"
+"802d28f4-442f-47da-8e16-eb08d4de21b4",,"ANT","Netherlands Antilles","AN","[]"
+"5880f989-f10d-4a9c-aae8-4e6c7b212dd8",,"NLD","Netherlands, Kingdom of the","NL","[]"
+"587f11ed-27de-4751-9d04-b04f13f3f67c",,"NCL","New Caledonia","NC","[]"
+"322c12c9-7b5a-4343-9861-23c93bbe62b4",,"NZL","New Zealand","NZ","[]"
+"290da724-674d-4c99-8630-cb237162ae0a",,"NIC","Nicaragua, Republic of","NI","[]"
+"1804792f-cccd-4f14-9e63-5c241bfd8429",,"NER","Niger, Republic of the","NE","[]"
+"6dae052c-7477-485a-9d2c-63760991f9d8",,"NGA","Nigeria, Federal Republic of","NG","[]"
+"e804fe1d-8246-481b-a293-d3c0b71d6abd",,"NIU","Niue, Republic of","NU","[]"
+"3d5afd71-90d7-459f-ade1-c8b65cbc7fe1",,"NFK","Norfolk Island","NF","[]"
+"43471298-1133-473e-b9b3-9152c5955177",,"MNP","Northern Mariana Islands","MP","[]"
+"e136efdf-82bb-4528-be5c-881acd8315cb",,"NOR","Norway, Kingdom of","NO","[]"
+"36f43aca-3302-4abd-a7e3-f65ff050a087",,"OMN","Oman, Sultanate of","OM","[]"
+"d42712ec-45aa-4811-9029-d38e5a607345",,"PAK","Pakistan, Islamic Republic of","PK","[]"
+"02f4bc12-bc36-447b-b08c-e74e8fe25678",,"PLW","Palau","PW","[]"
+"41f45c19-6910-470e-86fb-a3f426b8ca9c",,"PSE","Palestinian Territory, Occupied","PS","[]"
+"fd2ac965-bdb4-484a-9e4a-250f26aad030",,"PAN","Panama, Republic of","PA","[]"
+"3bc710b1-8b46-48e3-bdcd-54f64ca018cc",,"PNG","Papua New Guinea","PG","[]"
+"e99f321f-664a-4a4b-90a9-1bdc98ea35f6",,"PRY","Paraguay, Republic of","PY","[]"
+"e4d92c3e-0f91-41d8-b10e-58c78b4c55ea",,"PER","Peru, Republic of","PE","[]"
+"8547697c-d80f-4531-b092-4c9fde373d7b",,"PHL","Philippines, Republic of the","PH","[]"
+"c3abd7ab-c953-4c0c-8bc1-e32f4a49775a",,"PCN","Pitcairn Island","PN","[]"
+"579f8a7a-7fa5-4783-a8ec-cdc527781411",,"POL","Poland, Polish People's Republic","PL","[]"
+"f47bd6f5-c82b-4932-81ce-40345748536b",,"PRT","Portugal, Portuguese Republic","PT","[]"
+"6471bdcc-b4cc-4a07-b946-dd15be7eec41",,"PRI","Puerto Rico","PR","[]"
+"710d68a7-4a02-4d70-bbc8-22b904893429",,"QAT","Qatar, State of","QA","[]"
+"d85d98f6-3f09-44b0-a39b-0e2b6bf4746c",,"REU","Reunion","RE","[]"
+"7d7c8221-4123-4ba2-88ef-25e7f10aafbc",,"ROU","Romania, Socialist Republic of","RO","[]"
+"504292b5-053a-4c6a-a690-db031ac02fc0",,"RUS","Russian Federation","RU","[]"
+"27c2cc85-7c54-4356-b713-836c15f2da4e",,"RWA","Rwanda, Rwandese Republic","RW","[]"
+"626ec513-fddb-41f3-ab36-2ae2190a1bc1",,"SHN","St. Helena","SH","[]"
+"777d19e2-d5e8-48e2-9a0f-cd95097e4e75",,"KNA","St. Kitts and Nevis","KN","[]"
+"a3a55f1c-ea50-43df-b141-e8543eb20ebb",,"LCA","St. Lucia","LC","[]"
+"34f97908-18c5-4f67-b411-1b905161a330",,"SPM","St. Pierre and Miquelon","PM","[]"
+"dfe67a34-6a3a-4a56-8f90-3c007360f105",,"VCT","St. Vincent and the Grenadines","VC","[]"
+"7ad3f6bd-5e8a-467b-a481-1a523066b0e7",,"WSM","Samoa, Independent State of","WS","[]"
+"e0c3ad69-a078-424f-a7d4-81025d190c91",,"SMR","San Marino, Republic of","SM","[]"
+"a5369890-7a96-46bf-b91c-2c47d86660dd",,"STP","Sao Tome and Principe, Democratic Republic of","ST","[]"
+"62fe4794-7fb0-4520-9493-b9150436393e",,"SAU","Saudi Arabia, Kingdom of","SA","[]"
+"e106a448-1205-4515-96f4-758e98176342",,"SEN","Senegal, Republic of","SN","[]"
+"94430436-eb97-4048-bf57-270c42b73fd3",,"SCG","Serbia and Montenegro","CS","[]"
+"3bb44fb7-0976-4e3d-94b9-439763b53711",,"SYC","Seychelles, Republic of","SC","[]"
+"88e731a7-5c80-4f29-8cf0-54acf70d6277",,"SLE","Sierra Leone, Republic of","SL","[]"
+"e063b480-c834-4e39-b7a9-74fc578c637b",,"SGP","Singapore, Republic of","SG","[]"
+"0349b9b5-865d-46ea-9750-ab71962d5106",,"SVK","Slovakia (Slovak Republic)","SK","[]"
+"526b3fb4-08fc-4238-aa8b-e3217fae7214",,"SVN","Slovenia","SI","[]"
+"fc915f15-b2cf-40a7-8268-7c1f2744295a",,"SLB","Solomon Islands","SB","[]"
+"e8591331-3b75-4569-90a6-4aca1d1d9a53",,"SOM","Somalia, Somali Republic","SO","[]"
+"508c9fcb-1b6c-4225-8e31-262a4df64a85",,"ZAF","South Africa, Republic of","ZA","[]"
+"bf34dad1-63d1-4859-8818-da369616c470",,"SGS","South Georgia and the South Sandwich Islands","GS","[]"
+"e4d6474b-d903-4850-b51e-389f546b7601",,"ESP","Spain, Spanish State","ES","[]"
+"c7e74d0e-5c0d-4e3f-a19b-e072abbf0b92",,"LKA","Sri Lanka, Democratic Socialist Republic of","LK","[]"
+"a47a922b-fa61-4164-8f6d-7cf2ba33ca8c",,"SDN","Sudan, Democratic Republic of the","SD","[]"
+"6268a5c7-df0e-4230-8681-966798383dc4",,"SUR","Suriname, Republic of","SR","[]"
+"e47f9fe5-54c7-4c61-8c74-abc514749e41",,"SJM","Svalbard & Jan Mayen Islands","SJ","[]"
+"bb006073-0088-4adf-9482-01e598bc3fd3",,"SWZ","Swaziland, Kingdom of","SZ","[]"
+"8272e206-cb6f-499c-a1d9-7c581f5947c5",,"SWE","Sweden, Kingdom of","SE","[]"
+"dd79f943-8237-4710-bc5f-acc1ea1a2dd8",,"CHE","Switzerland, Swiss Confederation","CH","[]"
+"f92c3ca4-3468-40b6-b387-d4677fca86d9",,"SYR","Syrian Arab Republic","SY","[]"
+"0fffb0e5-81b9-40be-be69-9aff204f51c4",,"TWN","Taiwan, Province of China","TW","[]"
+"b78e4b96-6095-4316-bc4c-6bdec5593622",,"TJK","Tajikistan","TJ","[]"
+"8a519200-784a-495a-b0da-b3277913b880",,"TZA","Tanzania, United Republic of","TZ","[]"
+"6c35d8b5-a75b-4f17-8869-04cad4535bd8",,"THA","Thailand, Kingdom of","TH","[]"
+"77f9e6b5-a363-454c-996b-34aec2f10f99",,"TLS","Timor-Leste, Democratic Republic of","TL","[]"
+"75f15dd5-9998-4937-9a2c-b440798a6695",,"TGO","Togo, Togolese Republic","TG","[]"
+"b301d428-6936-4538-b5d3-778534b779e6",,"TKL","Tokelau (Tokelau Islands)","TK","[]"
+"0abdcd01-09ff-42a8-b8ba-10458dca5ba9",,"TON","Tonga, Kingdom of","TO","[]"
+"20ed7f03-1263-47fd-a4df-26fab6daae75",,"TTO","Trinidad and Tobago, Republic of","TT","[]"
+"e121e4d7-e1aa-4f2e-9b9e-33f5109460d7",,"TUN","Tunisia, Republic of","TN","[]"
+"f7c15c55-d0b3-4eda-8961-582d5071df78",,"TUR","Turkey, Republic of","TR","[]"
+"442c0439-cf39-4c5a-96de-a99fe1a476cf",,"TKM","Turkmenistan","TM","[]"
+"d6c83f2f-5130-477a-994e-daa08b70352f",,"TCA","Turks and Caicos Islands","TC","[]"
+"30745e37-22c6-4b92-b955-85cb23f0526f",,"TUV","Tuvalu","TV","[]"
+"b5f9a299-41ea-414b-83d5-91518f64a481",,"VIR","US Virgin Islands","VI","[]"
+"e74c11af-3a4e-4d13-9c2a-2e57d2954111",,"UGA","Uganda, Republic of","UG","[]"
+"c44e49c7-a447-466d-ae4f-d290ab03ff18",,"UKR","Ukraine","UA","[]"
+"a5b5e8ce-66c8-4ca0-a31b-473c90876108",,"ARE","United Arab Emirates","AE","[]"
+"5364e352-926f-4e07-9abb-2deea19346ec",,"GBR","United Kingdom of Great Britain & N. Ireland","GB","[]"
+"4e88114b-e278-4816-ba7d-7bc17098c407",,"UMI","United States Minor Outlying Islands","UM","[]"
+"d9dacd9e-dd04-4641-957a-589bdb9fe5fb",,"USA","United States of America","US","[]"
+"baf46f00-7b05-4d88-b1cf-ce922f3ba262",,"URY","Uruguay, Eastern Republic of","UY","[]"
+"86ebc56d-8b06-4bb1-a0f9-b15626c02fbd",,"UZB","Uzbekistan","UZ","[]"
+"b4e16ad0-3cb7-4809-a5ae-9a143595c2a4",,"VUT","Vanuatu","VU","[]"
+"e8099497-0e51-41ca-85d7-d23b730d9c1a",,"VEN","Venezuela, Bolivarian Republic of","VE","[]"
+"f9295319-572e-4c3d-9962-176a7802750b",,"VNM","Viet Nam, Socialist Republic of","VN","[]"
+"b4844963-f140-41b3-935d-58fd14df5878",,"WLF","Wallis and Futuna Islands","WF","[]"
+"fa9e1eb4-ee4c-4b13-82dd-ec42a8b7e627",,"ESH","Western Sahara","EH","[]"
+"713e1840-ff18-4a96-bc32-3da2b048c77d",,"YEM","Yemen","YE","[]"
+"90318040-d346-4c8f-be69-fa8ade0b12d9",,"ZMB","Zambia, Republic of","ZM","[]"
+"aa96ca19-46ab-40ad-a494-e4842f13eb4c",,"ZWE","Zimbabwe","ZW","[]"
\ No newline at end of file

diff --git a/cdmlibrary/src/test/java/eu/etaxonomy/cdm/database/init/TermLoaderTest.java b/cdmlibrary/src/test/java/eu/etaxonomy/cdm/database/init/TermLoaderTest.java
index 1d38394afa9aa7cd13b81713759d982b6ba5e994..5a8bf108dff95e90dd2ec138252ac4b129de68a4 100644 (file)
--- a/cdmlibrary/src/test/java/eu/etaxonomy/cdm/database/init/TermLoaderTest.java
+++ b/cdmlibrary/src/test/java/eu/etaxonomy/cdm/database/init/TermLoaderTest.java
@@ -28,9 +28,9 @@ public class TermLoaderTest extends CdmUnitTestBase{
        @Test
        public void loadTerms() {
                try {
+                       loader.loadDefaultTerms(WaterbodyOrCountry.class);
                        loader.loadDefaultTerms(Language.class);
                        loader.loadDefaultTerms(Continent.class);
-                       //loader.loadDefaultTerms(WaterbodyOrCountry.class);
                        loader.loadDefaultTerms(Rank.class);
                        loader.loadDefaultTerms(TypeDesignationStatus.class);
                        loader.loadDefaultTerms(NomenclaturalStatusType.class);