Index: modules/uoa-search/tags/uoa-search-3.5.2/deploy.info
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/deploy.info	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/deploy.info	(nonexistent)
@@ -1,10 +0,0 @@
-{
-  "type_source": "SVN", 
-  "goal": "package -U -T 4C source:jar", 
-  "url": "http://svn-public.driver.research-infrastructures.eu/driver/dnet45/modules/uoa-search/trunk", 
-  "deploy_repository": "dnet45-snapshots", 
-  "version": "4", 
-  "mail": "antleb@di.uoa.gr, kiatrop@di.uoa.gr", 
-  "deploy_repository_url": "http://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-snapshots", 
-  "name": "uoa-search"
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/Namesof TextObjectTypologies_es_ES.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/Namesof TextObjectTypologies_es_ES.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/Namesof TextObjectTypologies_es_ES.xml	(nonexistent)
@@ -1,112 +0,0 @@
-<RESOURCE_PROFILE xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <HEADER>
-        <RESOURCE_IDENTIFIER value="10a89de8-8f16-4e8c-824c-f76646438fa6_Vm9jYWJ1bGFyeURTUmVzb3VyY2VzL1ZvY2FidWxhcnlEU1Jlc291cmNlVHlwZQ=="/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2010-12-23T19:05:23+01:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Names of Text Object Typologies_es_ES</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>List of typology types provided by the DRIVER Guidelines for Repository content</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM encoding="0000" english_name="Desconocido" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0001" english_name="Artículo" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVER" term="Article in monograph or in proceedings"/>
-                        <SYNONYM encoding="DRIVER" term="Article/Letter to editor"/>
-                        <SYNONYM encoding="DRIVER" term="Article / Letter to the editor"/>
-                        <SYNONYM encoding="DRIVER" term="Article / Letter to editor"/>
-                        <SYNONYM encoding="DRIVER" term="Article-letter to the editor"/>
-                        <SYNONYM encoding="DRIVER" term="Article - letter to the editor"/>
-                        <SYNONYM encoding="DRIVER" term="Journal article"/>
-                        <SYNONYM encoding="DRIVER" term="Journal article (on-line or printed)"/>
-                        <SYNONYM encoding="DRIVER" term="Peer-reviewed Article"/>
-                        <SYNONYM encoding="DRIVER" term="Article / Newspaper"/>
-                        <SYNONYM encoding="DRIVER" term="Aufsatz"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0002" english_name="Libro" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVER" term="Book (monograph)"/>
-                        <SYNONYM encoding="DRIVER" term="Book - monograph - editorial book"/>
-                        <SYNONYM encoding="DRIVER" term="Book Section"/>
-                        <SYNONYM encoding="DRIVER" term="Monograph"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0003" english_name="Lectura de Conferencia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0004" english_name="Informe de Conferencia" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVER" term="Conference or Workshop Item"/>
-                        <SYNONYM encoding="DRIVER" term="Conference Paper"/>
-                        <SYNONYM encoding="DRIVER" term="Conference contribution"/>
-                        <SYNONYM encoding="DRIVER" term="Conference Paper"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0005" english_name="Contribución a periódico o pulicación semanal" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0006" english_name="Tesis doctoral" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DINI" term="Text.Thesis.Doctoral"/>
-                        <SYNONYM encoding="DRIVER" term="Thesis.Doctoral"/>
-                        <SYNONYM encoding="DRIVER" term="Dissertation"/>
-                        <SYNONYM encoding="DRIVER" term="Diss"/>
-                        <SYNONYM encoding="DRIVER" term="DoctoralThesis"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0007" english_name="Tesis de Master" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DINI" term="Masters-Thesis.Magister"/>
-                        <SYNONYM encoding="DRIVER" term="Thesis.Master"/>
-                        <SYNONYM encoding="DRIVER" term="Masters thesis"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0008" english_name="Proyecto fin de carrera" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0009" english_name="Informe de Investigación Externo" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DINI" term="Tech-Report"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0010" english_name="Lectura" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DINI" term="Public-Lecture"/>
-                        <SYNONYM encoding="DRIVER" term="Inaugural lecture"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0011" english_name="Informe Interno" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0012" english_name="Noticia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0013" english_name="Parte de Libro o Capítulo de Libro" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVER" term="Part of book - chapter"/>
-                        <SYNONYM encoding="DRIVER" term="Book editorial"/>
-                        <SYNONYM encoding="DRIVER" term="Book section"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0014" english_name="Trabajo de Investigación" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DINI" term="Research-Paper"/>
-                        <SYNONYM encoding="DINI" term="Paper"/>
-                        <SYNONYM encoding="DINI" term="ResearchPaper"/>
-                    </SYNONYMS>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2007-05-06T23:02:07+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS/>
-    </BODY>
-</RESOURCE_PROFILE>
-
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/NamesofCountries_es_ES.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/NamesofCountries_es_ES.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/NamesofCountries_es_ES.xml	(nonexistent)
@@ -1,757 +0,0 @@
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value="e540db9e-768a-4c75-8f37-5d0f8d0f3115_Vm9jYWJ1bGFyeURTUmVzb3VyY2VzL1ZvY2FidWxhcnlEU1Jlc291cmNlVHlwZQ=="/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2010-12-23T19:12:24+01:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Names of Countries_es_ES</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>OASIS list of country codes Country Code List: ISO 3166-1993 (E). No mappings provided.</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM encoding="AD" english_name="Andorra" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AE" english_name="Emiratos Árabes Unidos" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AF" english_name="Afganistán" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AG" english_name="Antigua y Barbuda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AI" english_name="Anguila" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AL" english_name="Albania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AM" english_name="Armenia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AN" english_name="Antillas Holandesas" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AO" english_name="Angola" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AQ" english_name="Antartida" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AR" english_name="Argentina" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AS" english_name="Samoa Americana" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AT" english_name="Austria" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AU" english_name="Australia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AW" english_name="Aruba" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AZ" english_name="Azerbaiyán" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BA" english_name="Bosnia y Herzegovina" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BB" english_name="Barbados" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BD" english_name="Bangladesh" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BE" english_name="Bélgica" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BF" english_name="Burkina Faso" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BG" english_name="Bulgaria" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BH" english_name="Bahréin" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BI" english_name="Burundi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BJ" english_name="Benín" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BM" english_name="Bermudas" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BN" english_name="Brunéi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BO" english_name="Bolivia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BR" english_name="Brasil" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BS" english_name="Bahamas" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BT" english_name="Bután" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BU" english_name="Birmania (ya no existe)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BV" english_name="Isla Bouvet" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BW" english_name="Botsuana" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BY" english_name="Bielorrusia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BZ" english_name="Belice" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CA" english_name="Canada" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CC" english_name="Islas Cocos (Keeling)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CF" english_name="República Centroafricana" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CG" english_name="República del Congo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CH" english_name="Suiza" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CI" english_name="Costa de Marfil" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CK" english_name="Islas Cook" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CL" english_name="Chile" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CM" english_name="Camerún" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CN" english_name="China" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CO" english_name="Colombia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CR" english_name="Costa Rica" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CS" english_name="Checoslovaquia (ya no existe)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CU" english_name="Cuba" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CV" english_name="Cabo Verde" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CX" english_name="Isla de Navidad" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CY" english_name="Chipre" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CZ" english_name="República Checa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DD" english_name="República Democrática Alemana (ya no existe)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DE" english_name="Alemania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DJ" english_name="Yibuti" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DK" english_name="Dinamarca" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DM" english_name="Dominica" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DO" english_name="República Dominicana" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DZ" english_name="Argelia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="EC" english_name="Ecuador" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="EE" english_name="Estonia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="EG" english_name="Egipto" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="EH" english_name="Sahara Occidental" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ER" english_name="Eritrea" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ES" english_name="España" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ET" english_name="Etiopía" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FI" english_name="Finlandia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FJ" english_name="Fiyi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FK" english_name="Islas Malvinas" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FM" english_name="Estados Federados de Micronesia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FO" english_name="Islas Feroe" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FR" english_name="Francia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FX" english_name="Francia, Metropolitana" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GA" english_name="Gabón" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UK" english_name="Reino Unido" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GD" english_name="Granada" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GE" english_name="Georgia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GF" english_name="Guayana Francesa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GH" english_name="Ghana" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GI" english_name="Gibraltar" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GL" english_name="Groenlandia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GM" english_name="Gambia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GN" english_name="Guinea" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GP" english_name="Guadalupe" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GQ" english_name="Guinea Ecuatorial" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GR" english_name="Grecia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GS" english_name="Islas Georgias del Sur y Sandwich del Sur " native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GT" english_name="Guatemala" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GU" english_name="Guam" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GW" english_name="Guinea-Bissau" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GY" english_name="Guyana" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HK" english_name="Hong Kong" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HM" english_name="Islas Heard y McDonald" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HN" english_name="Honduras" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HR" english_name="Croacia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HT" english_name="Haiti" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HU" english_name="Hungría" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ID" english_name="Indonesia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IE" english_name="Irlanda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IL" english_name="Israel" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IN" english_name="India" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IO" english_name="Territorio Británico del Océano Índico" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IQ" english_name="Irak" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IR" english_name="República Islámica de Irán" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IS" english_name="Islandia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IT" english_name="Italia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="JM" english_name="Jamaica" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="JO" english_name="Jordania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="JP" english_name="Japón" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KE" english_name="Kenia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KG" english_name="Kirguistán" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KH" english_name="Camboya" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KI" english_name="Kiribati" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KM" english_name="Comoras" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KN" english_name="San Cristóbal y Nieves" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KP" english_name="República Popular Democrática de Corea" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KR" english_name="República de Corea" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KW" english_name="Kuwait" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KY" english_name="Islas Cayman" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KZ" english_name="Kazajistán" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LA" english_name="República Democrática Popular Lao" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LB" english_name="Líbano" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LC" english_name="Santa Lucía" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LI" english_name="Liechtenstein" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LK" english_name="Sri Lanka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LR" english_name="Liberia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LS" english_name="Lesotho" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LT" english_name="Lituania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LU" english_name="Luxemburgo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LV" english_name="Letonia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LY" english_name="Libia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MA" english_name="Marruecos" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MC" english_name="Mónaco" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MD" english_name="República de Moldavia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MG" english_name="Madagascar" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MH" english_name="Islas Marshall" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ML" english_name="Mali" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MN" english_name="Mongolia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MM" english_name="Myanmar" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MO" english_name="Macao" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MP" english_name="Islas Marianas del Norte" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MQ" english_name="Martinica" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MR" english_name="Mauritania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MS" english_name="Monserrat" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MT" english_name="Malta" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MU" english_name="Mauritania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MV" english_name="Maldivas" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MW" english_name="Malaui" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MX" english_name="México" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MY" english_name="Malasia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MZ" english_name="Mozambique" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NA" english_name="Namibia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NC" english_name="Nueva Caledonia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NE" english_name="Níger" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NF" english_name="Isla Norfolk" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NG" english_name="República Federal de Nigeria" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NI" english_name="Nicaragua" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NL" english_name="Países Bajos" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NO" english_name="Noruega" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NP" english_name="Nepal" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NR" english_name="República de Nauru" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NT" english_name="Zona neutral saudí-iraquí (ya no existe)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NU" english_name="Niue" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NZ" english_name="Nueva Zelanda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="OM" english_name="Omán" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PA" english_name="Panamá" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PE" english_name="Perú" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PF" english_name="Polinesia Francesa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PG" english_name="Papúa Nueva Guinea" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PH" english_name="Filipinas" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PK" english_name="Pakistán" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PL" english_name="Polonia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PM" english_name="San Pedro y Miguelón" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PN" english_name="Islas Pitcairn" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PR" english_name="Puerto Rico" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PT" english_name="Portugal" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PW" english_name="Palaos" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PY" english_name="Paraguay" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="QA" english_name="Qatar" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="RE" english_name="Reunión" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="RO" english_name="Rumanía" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="RU" english_name="Federación de Rusia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="RW" english_name="Ruanda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SA" english_name="Arabia Saudí" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SB" english_name="Islas Salomón" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SC" english_name="República de las Seychelles" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SD" english_name="Sudán" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SE" english_name="Suecia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SG" english_name="Singapur" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SH" english_name="Santa Helena" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SI" english_name="Eslovenia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SJ" english_name="Svalbard y Jan Mayen" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SK" english_name="Eslovaquia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SL" english_name="Sierra Leona" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SM" english_name="San Marino" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SN" english_name="Senegal" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SO" english_name="Somalia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SR" english_name="Surinam" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ST" english_name="Santo Tomé y Príncipe" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SU" english_name="Unión de Repúblicas Socialistas Soviéticas (ya no existe)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SV" english_name="El Salvador" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SY" english_name="República Árabe Siria" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SZ" english_name="Suazilandia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TC" english_name="Islas Turcas y Caicos" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TD" english_name="Chad" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TF" english_name="Tierras Australes y Antárticas Francesas" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TG" english_name="Togo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TH" english_name="Tailandia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TJ" english_name="Tayikistán" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TK" english_name="Tokelau" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TM" english_name="Turkmenistán" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TN" english_name="Túnez" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TO" english_name="Tonga" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TP" english_name="Timor Oriental" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TR" english_name="Turquía" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TT" english_name="Trinidad y Tobago" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TV" english_name="Tuvalu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TW" english_name="República de China (Taiwán)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TZ" english_name="República Unida de Tanzania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UA" english_name="Ucrania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UG" english_name="Uganda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UM" english_name="Islas Ultramarinas de Estados Unidos" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="US" english_name="Estados Unidos de América" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UY" english_name="Uruguay" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UZ" english_name="Uzbekistán" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VA" english_name="Estado de la Ciudad del Vaticano" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VC" english_name="San Vicente y las Granadinas" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VE" english_name="Venezuela" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VG" english_name="Islas Vírgenes Británicas" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VI" english_name="Islas Vírgenes de los Estados Unidos" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VN" english_name="Vietnam" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VU" english_name="Vanuatu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="WF" english_name="Wallis y Futuna" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="WS" english_name="Samoa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="YD" english_name="Yemen del Sur (ya no existe)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="YE" english_name="Yemen" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="YT" english_name="Mayotte" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="YU" english_name="Yugoslavia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ZA" english_name="Sudáfrica" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ZM" english_name="Zambia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CD" english_name="República Democrática del Congo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ZW" english_name="Zimbabue" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ZZ" english_name="País desconocido o no especificado" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-06-25T14:50:49+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
-
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/Namesof TextObjectTypologies.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/Namesof TextObjectTypologies.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/Namesof TextObjectTypologies.xml	(nonexistent)
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <HEADER>
-        <RESOURCE_IDENTIFIER value="5-67454a39-107f-4678-8db6-d08f53f28ea2_Vm9jYWJ1bGFyeURTUmVzb3VyY2VzL1ZvY2FidWxhcnlEU1Jlc291cmNlVHlwZQ=="/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2008-02-06T11:32:53+01:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Names of Text Object Typologies</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>List of typology types provided by the DRIVER Guidelines for Repository content</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM native_name="" encoding="0000" english_name="Unknown">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Article" encoding="0001">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVER" term="Article in monograph or in proceedings"/>
-                        <SYNONYM encoding="DRIVER" term="Article/Letter to editor"/>
-                        <SYNONYM term="Article / Letter to the editor" encoding="DRIVER"/>
-                        <SYNONYM term="Article / Letter to editor" encoding="DRIVER"/>
-                        <SYNONYM encoding="DRIVER" term="Article-letter to the editor"/>
-                        <SYNONYM term="Article - letter to the editor" encoding="DRIVER"/>
-                        <SYNONYM term="Journal article" encoding="DRIVER"/>
-                        <SYNONYM term="Journal article (on-line or printed)" encoding="DRIVER"/>
-                        <SYNONYM encoding="DRIVER" term="Peer-reviewed Article"/>
-                        <SYNONYM term="Article / Newspaper" encoding="DRIVER"/>
-                        <SYNONYM term="Aufsatz" encoding="DRIVER"/>
-                        <SYNONYM encoding="DRIVERGuidelinesV2" term="info:eu-repo/semantics/article"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0002" native_name="" english_name="Book">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVER" term="Book (monograph)"/>
-                        <SYNONYM encoding="DRIVER" term="Book - monograph - editorial book"/>
-                        <SYNONYM term="Book Section" encoding="DRIVER"/>
-                        <SYNONYM encoding="DRIVER" term="Monograph"/>
-                        <SYNONYM encoding="DRIVERGuidelinesV2" term="info:eu-repo/semantics/book"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="0004" english_name="Conference object">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVER" term="Conference or Workshop Item"/>
-                        <SYNONYM encoding="DRIVER" term="Conference Paper"/>
-                        <SYNONYM term="Conference contribution" encoding="DRIVER"/>
-                        <SYNONYM term="Conference lecture" encoding="DRIVER"/>
-                        <SYNONYM encoding="DRIVER" term="Conference report"/>
-                        <SYNONYM encoding="DRIVERGuidelinesV2" term="info:eu-repo/semantics/conferenceObject"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Contribution for newspaper or weekly magazine" native_name="" encoding="0005">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVERGuidelinesV2" term="info:eu-repo/semantics/contributionToPeriodical"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0006" english_name="Doctoral thesis" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="Text.Thesis.Doctoral" encoding="DINI"/>
-                        <SYNONYM term="Thesis.Doctoral" encoding="DRIVER"/>
-                        <SYNONYM encoding="DRIVER" term="Dissertation"/>
-                        <SYNONYM term="Diss" encoding="DRIVER"/>
-                        <SYNONYM encoding="DRIVER" term="DoctoralThesis"/>
-                        <SYNONYM encoding="DRIVERGuidelinesV2" term="info:eu-repo/semantics/doctoralThesis"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0007" english_name="Master thesis" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DINI" term="Masters-Thesis.Magister"/>
-                        <SYNONYM term="Thesis.Master" encoding="DRIVER"/>
-                        <SYNONYM encoding="DRIVER" term="Masters thesis"/>
-                        <SYNONYM encoding="DRIVERGuidelinesV2" term="info:eu-repo/semantics/masterThesis"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Bachelor thesis" encoding="0008">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVERGuidelinesV2" term="info:eu-repo/semantics/bachelorThesis"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0009" english_name="External research report" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="Tech-Report" encoding="DINI"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0010" english_name="Lecture" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="Public-Lecture" encoding="DINI"/>
-                        <SYNONYM term="Inaugural lecture" encoding="DRIVER"/>
-                        <SYNONYM term="info:eu-repo/semantics/lecture" encoding="DRIVERGuidelinesV2"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="0011" english_name="Internal report">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="0012" english_name="Newsletter">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0013" english_name="Part of book or chapter of book" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVER" term="Part of book - chapter"/>
-                        <SYNONYM encoding="DRIVER" term="Book editorial"/>
-                        <SYNONYM encoding="DRIVER" term="Book section"/>
-                        <SYNONYM term="info:eu-repo/semantics/bookPart" encoding="DRIVERGuidelinesV2"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Research paper" native_name="" encoding="0014">
-                    <SYNONYMS>
-                        <SYNONYM term="Research-Paper" encoding="DINI"/>
-                        <SYNONYM term="Paper" encoding="DINI"/>
-                        <SYNONYM term="ResearchPaper" encoding="DINI"/>
-                        <SYNONYM encoding="DRIVERGuidelinesV2" term="info:eu-repo/semantics/workingPaper"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Review" native_name="" encoding="0015">
-                    <SYNONYMS>
-                        <SYNONYM term="info:eu-repo/semantics/review" encoding="DRIVERGuidelinesV2"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Preprint" native_name="" encoding="0016">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVERGuidelinesV2" term="info:eu-repo/semantics/preprint"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="0017" english_name="Report">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVERGuidelinesV2" term="info:eu-repo/semantics/report"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="0018" english_name="Annotation">
-                    <SYNONYMS>
-                        <SYNONYM term="info:eu-repo/semantics/annotation" encoding="DRIVERGuidelinesV2"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0019" english_name="Patent" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVERGuidelinesV2" term="info:eu-repo/semantics/patent"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Other" encoding="0020">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVERGuidelinesV2" term="info:eu-repo/semantics/other"/>
-                    </SYNONYMS>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2007-05-06T23:02:07+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS/>
-    </BODY>
-</RESOURCE_PROFILE>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/NamesofCountries.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/NamesofCountries.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/NamesofCountries.xml	(nonexistent)
@@ -1,763 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value="3-959aed5b-9ccc-40ff-9791-352d05098cdd_Vm9jYWJ1bGFyeURTUmVzb3VyY2VzL1ZvY2FidWxhcnlEU1Jlc291cmNlVHlwZQ=="/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2008-06-25T14:50:49+02:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Names of Countries</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>OASIS list of country codes Country Code List: ISO 3166-1993 (E). No mappings provided.</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM encoding="AD" english_name="Andorra" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AE" native_name="" english_name="United Arab Emirates">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AF" english_name="Afghanistan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="AG" english_name="Antigua &amp; Barbuda">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="AI" english_name="Anguilla">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Albania" native_name="" encoding="AL">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Armenia" encoding="AM">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Netherlands Antilles" encoding="AN" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Angola" native_name="" encoding="AO">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="AQ" english_name="Antarctica">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Argentina" encoding="AR" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="American Samoa" native_name="" encoding="AS">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AT" native_name="" english_name="Austria">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Australia" encoding="AU">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Aruba" encoding="AW">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AZ" native_name="" english_name="Azerbaijan">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Bosnia and Herzegovina" encoding="BA" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="BB" english_name="Barbados">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Bangladesh" native_name="" encoding="BD">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Belgium" encoding="BE" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BF" english_name="Burkina Faso" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BG" english_name="Bulgaria" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="BH" english_name="Bahrain">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BI" native_name="" english_name="Burundi">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="BJ" english_name="Benin">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="BM" english_name="Bermuda">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BN" native_name="" english_name="Brunei Darussalam">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Bolivia" encoding="BO">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="BR" english_name="Brazil">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BS" english_name="Bahama" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BT" native_name="" english_name="Bhutan">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BU" native_name="" english_name="Burma (no longer exists)">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Bouvet Island" native_name="" encoding="BV">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Botswana" native_name="" encoding="BW">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BY" native_name="" english_name="Belarus">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Belize" native_name="" encoding="BZ">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Canada" encoding="CA" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CC" english_name="Cocos (Keeling) Islands" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Central African Republic" encoding="CF" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Congo" encoding="CG">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Switzerland" encoding="CH">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="C&amp;ocirc;te D'ivoire (Ivory Coast)" native_name="" encoding="CI">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Cook Islands" native_name="" encoding="CK">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CL" english_name="Chile" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CM" native_name="" english_name="Cameroon">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CN" english_name="China" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Colombia" encoding="CO">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Costa Rica" native_name="" encoding="CR">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Czechoslovakia (no longer exists)" encoding="CS">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Cuba" encoding="CU">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CV" english_name="Cape Verde" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CX" native_name="" english_name="Christmas Island">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Cyprus" encoding="CY">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Czech Republic" encoding="CZ">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="German Democratic Republic (no longer exists)" encoding="DD" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DE" english_name="Germany" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DJ" native_name="" english_name="Djibouti">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="DK" english_name="Denmark">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Dominica" encoding="DM">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Dominican Republic" encoding="DO">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Algeria" encoding="DZ" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Ecuador" encoding="EC" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Estonia" encoding="EE">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="EG" english_name="Egypt">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Western Sahara" encoding="EH" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Eritrea" native_name="" encoding="ER">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ES" native_name="" english_name="Spain">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Ethiopia" encoding="ET" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="FI" english_name="Finland">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Fiji" encoding="FJ">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Falkland Islands (Malvinas)" native_name="" encoding="FK">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FM" native_name="" english_name="Micronesia">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FO" native_name="" english_name="Faroe Islands">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="France" encoding="FR" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="France, Metropolitan" native_name="" encoding="FX">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GA" english_name="Gabon" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UK" native_name="" english_name="United Kingdom (Great Britain)">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GD" native_name="" english_name="Grenada">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GE" native_name="" english_name="Georgia">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="GF" english_name="French Guiana">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GH" native_name="" english_name="Ghana">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GI" english_name="Gibraltar" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Greenland" encoding="GL" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="GM" english_name="Gambia">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Guinea" encoding="GN">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Guadeloupe" native_name="" encoding="GP">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Equatorial Guinea" encoding="GQ" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="GR" english_name="Greece">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="South Georgia and the South Sandwich Islands" native_name="" encoding="GS">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GT" native_name="" english_name="Guatemala">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Guam" native_name="" encoding="GU">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GW" english_name="Guinea-Bissau" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GY" english_name="Guyana" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="HK" english_name="Hong Kong">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Heard &amp; McDonald Islands" native_name="" encoding="HM">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Honduras" native_name="" encoding="HN">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Croatia" encoding="HR">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="HT" english_name="Haiti">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HU" native_name="" english_name="Hungary">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ID" english_name="Indonesia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="IE" english_name="Ireland">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IL" english_name="Israel" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="India" encoding="IN">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="IO" english_name="British Indian Ocean Territory">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Iraq" native_name="" encoding="IQ">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Islamic Republic of Iran" encoding="IR" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Iceland" encoding="IS" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IT" native_name="" english_name="Italy">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="JM" native_name="" english_name="Jamaica">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Jordan" encoding="JO">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Japan" encoding="JP">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="KE" english_name="Kenya">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Kyrgyzstan" native_name="" encoding="KG">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Cambodia" native_name="" encoding="KH">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KI" english_name="Kiribati" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KM" native_name="" english_name="Comoros">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="St. Kitts and Nevis" encoding="KN">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Korea, Democratic People's Republic of" native_name="" encoding="KP">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KR" english_name="Korea, Republic of" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KW" native_name="" english_name="Kuwait">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Cayman Islands" encoding="KY">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Kazakhstan" native_name="" encoding="KZ">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Lao People's Democratic Republic" encoding="LA">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Lebanon" encoding="LB">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Saint Lucia" native_name="" encoding="LC">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Liechtenstein" encoding="LI">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Sri Lanka" encoding="LK">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Liberia" encoding="LR">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Lesotho" native_name="" encoding="LS">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Lithuania" encoding="LT" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Luxembourg" native_name="" encoding="LU">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Latvia" native_name="" encoding="LV">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Libyan Arab Jamahiriya" encoding="LY" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="MA" english_name="Morocco">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MC" english_name="Monaco" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MD" native_name="" english_name="Moldova, Republic of">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Madagascar" encoding="MG">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Madagascar" native_name="" encoding="MG">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Marshall Islands" encoding="MH">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="ML" english_name="Mali">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Mongolia" encoding="MN">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="MM" english_name="Myanmar">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MO" native_name="" english_name="Macau">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MP" native_name="" english_name="Northern Mariana Islands">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MQ" native_name="" english_name="Martinique">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MR" native_name="" english_name="Mauritania">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Monserrat" encoding="MS" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Malta" native_name="" encoding="MT">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Mauritius" encoding="MU">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MV" native_name="" english_name="Maldives">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="MW" english_name="Malawi">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Mexico" encoding="MX" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MY" native_name="" english_name="Malaysia">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MZ" english_name="Mozambique" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="NA" english_name="Namibia">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="NC" english_name="New Caledonia">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="NE" english_name="Niger">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NF" native_name="" english_name="Norfolk Island">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="NG" english_name="Nigeria">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="NI" english_name="Nicaragua">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="NL" english_name="Netherlands">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Norway" encoding="NO">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="NP" english_name="Nepal">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NR" native_name="" english_name="Nauru">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Neutral Zone (no longer exists)" native_name="" encoding="NT">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NU" native_name="" english_name="Niue">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="New Zealand" encoding="NZ">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Oman" native_name="" encoding="OM">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Panama" native_name="" encoding="PA">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PE" english_name="Peru" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PF" english_name="French Polynesia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PG" native_name="" english_name="Papua New Guinea">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Philippines" encoding="PH">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Pakistan" encoding="PK">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Poland" native_name="" encoding="PL">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="PM" english_name="St. Pierre &amp; Miquelon">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Pitcairn" native_name="" encoding="PN">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PR" native_name="" english_name="Puerto Rico">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PT" english_name="Portugal" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PW" native_name="" english_name="Palau">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PY" native_name="" english_name="Paraguay">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="QA" english_name="Qatar">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="R&amp;eacute;union" native_name="" encoding="RE">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="RO" english_name="Romania">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="RU" native_name="" english_name="Russian Federation">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Rwanda" native_name="" encoding="RW">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SA" english_name="Saudi Arabia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="SB" english_name="Solomon Islands">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Seychelles" encoding="SC">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SD" english_name="Sudan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Sweden" encoding="SE" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SG" english_name="Singapore" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="St. Helena" encoding="SH">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Slovenia" encoding="SI">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SJ" english_name="Svalbard &amp; Jan Mayen Islands" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Slovakia" encoding="SK" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Sierra Leone" encoding="SL">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SM" native_name="" english_name="San Marino">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SN" native_name="" english_name="Senegal">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Somalia" encoding="SO" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Suriname" encoding="SR">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Sao Tome &amp; Principe" native_name="" encoding="ST">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Union of Soviet Socialist Republics (no longer exists)" encoding="SU">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="SV" english_name="El Salvador">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Syrian Arab Republic" encoding="SY">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Swaziland" encoding="SZ">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TC" english_name="Turks &amp; Caicos Islands" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Chad" native_name="" encoding="TD">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="French Southern Territories" native_name="" encoding="TF">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TG" native_name="" english_name="Togo">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Thailand" encoding="TH">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="TJ" english_name="Tajikistan">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Tokelau" encoding="TK" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Turkmenistan" encoding="TM">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TN" native_name="" english_name="Tunisia">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TO" native_name="" english_name="Tonga">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="East Timor" encoding="TP" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TR" native_name="" english_name="Turkey">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Trinidad &amp; Tobago" native_name="" encoding="TT">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Tuvalu" encoding="TV" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Taiwan, Province of China" encoding="TW">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TZ" native_name="" english_name="Tanzania, United Republic of">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Ukraine" encoding="UA" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="UG" english_name="Uganda">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="United States Minor Outlying Islands" native_name="" encoding="UM">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="US" english_name="United States of America" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="United States of America" encoding="US">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Uruguay" encoding="UY">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Uzbekistan" native_name="" encoding="UZ">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="VA" english_name="Vatican City State (Holy See)">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="VC" english_name="St. Vincent &amp; the Grenadines">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VE" native_name="" english_name="Venezuela">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="British Virgin Islands" encoding="VG">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VI" native_name="" english_name="United States Virgin Islands">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Viet Nam" native_name="" encoding="VN">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Vanuatu" native_name="" encoding="VU">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Wallis &amp; Futuna Islands" encoding="WF">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="WS" english_name="Samoa">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="YD" english_name="Democratic Yemen (no longer exists)">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Yemen" native_name="" encoding="YE">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="YT" native_name="" english_name="Mayotte">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Yugoslavia" encoding="YU" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ZA" native_name="" english_name="South Africa">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Zambia" encoding="ZM">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Zaire" native_name="" encoding="ZR">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ZW" native_name="" english_name="Zimbabwe">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="ZZ" english_name="Unknown or unspecified country">
-                    <SYNONYMS/>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-06-25T14:50:49+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/NamesofLanguages_pl_PL.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/NamesofLanguages_pl_PL.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/NamesofLanguages_pl_PL.xml	(nonexistent)
@@ -1,1533 +0,0 @@
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value="4-9a9666d9-be72-4e3b-9929-9b32a793500d_Vm9jYWJ1bGFyeURTUmVzb3VyY2VzL1ZvY2FidWxhcnlEU1Jlc291cmNlVHlwZQ=="/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value=""/>
-        <DATE_OF_CREATION value="2008-04-03T20:37:24+02:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Names of Languages_pl_PL</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>ISO 639-2 list of languages. It defines mapping from iso639-1 and DRIVER derived values.</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM encoding="abk" english_name="Abkhaz" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ab"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ace" english_name="Acehnese" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ach" english_name="Acoli" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ada" english_name="Adangme" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="aar" english_name="Afar" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="aa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="afh" english_name="Afrihili" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="afr" english_name="Afrikaans" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="af"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="afa" english_name="Afro-Asiatic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="aka" english_name="Akan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="akk" english_name="Akkadian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="alb/sqi" english_name="Albanian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sq"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ale" english_name="Aleut" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="alg" english_name="Algonquian languages" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tut" english_name="Altaic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="amh" english_name="Amharic" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="am"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="apa" english_name="Apache" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ara" english_name="Arabic" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ar"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="arc" english_name="Aramaic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="arp" english_name="Arapaho" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="arn" english_name="Araucanian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="arw" english_name="Arawak" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="arm/hye" english_name="Armenian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hy"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="art" english_name="Artificial" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="asm" english_name="Assamese" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="as"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ath" english_name="Athapascan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="map" english_name="Austronesian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ava" english_name="Avaric" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ave" english_name="Avestan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="awa" english_name="Awadhi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="aym" english_name="Aymara" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ay"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="aze" english_name="Azerbaijani" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="az"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="nah" english_name="Aztec" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ban" english_name="Balinese" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bat" english_name="Baltic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bal" english_name="Baluchi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bam" english_name="Bambara" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bai" english_name="Bamileke" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bad" english_name="Banda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bnt" english_name="Bantu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bas" english_name="Basa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bak" english_name="Bashkir" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ba"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="baq/eus" english_name="Basque" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="eu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bej" english_name="Beja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bem" english_name="Bemba" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ben" english_name="Bengali" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ber" english_name="Berber" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bho" english_name="Bhojpuri" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bih" english_name="Bihari" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bik" english_name="Bikol" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bin" english_name="Bini" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bis" english_name="Bislama" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bra" english_name="Braj" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bre" english_name="Breton" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="br"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bug" english_name="Buginese" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bul" english_name="Bulgarian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bg"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bua" english_name="Buriat" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bur/mya" english_name="Burmese" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="my"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bel" english_name="Byelorussian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="be"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="cad" english_name="Caddo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="car" english_name="Carib" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cat" english_name="Catalan" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ca"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="cau" english_name="Caucasian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ceb" english_name="Cebuano" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cel" english_name="Celtic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cai" english_name="Central American Indian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chg" english_name="Chagatai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cha" english_name="Chamorro" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="che" english_name="Chechen" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chr" english_name="Cherokee" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chy" english_name="Cheyenne" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chb" english_name="Chibcha" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chi/zho" english_name="Chinese" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="zh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="chn" english_name="Chinook jargon" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cho" english_name="Choctaw" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chu" english_name="Church Slavic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chv" english_name="Chuvash" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cop" english_name="Coptic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cor" english_name="Cornish" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cos" english_name="Corsican" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="co"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="cre" english_name="Cree" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mus" english_name="Creek" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="crp" english_name="Creoles and Pidgins" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cpe" english_name="English-based Creoles and Pidgins" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cpf" english_name="French-based Creoles and Pidgins" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cpp" english_name="Portuguese-based Creoles and Pidgins" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cus" english_name="Cushitic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="" english_name="Croatian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ces/cze" english_name="Czech" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="cs"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="dak" english_name="Dakota" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dan" english_name="Danish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="da"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="del" english_name="Delaware" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="din" english_name="Dinka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="div" english_name="Divehi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="doi" english_name="Dogri" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dra" english_name="Dravidian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dua" english_name="Duala" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dut/nla" english_name="Dutch" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="nl"/>
-                        <SYNONYM encoding="DRIVER" term="nl_nl"/>
-                        <SYNONYM encoding="DRIVER" term="nl_be"/>
-                        <SYNONYM encoding="DRIVER" term="nld"/>
-                        <SYNONYM encoding="DRIVER" term="dutdut"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="dum" english_name="Middle Dutch" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dyu" english_name="Dyula" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dzo" english_name="Dzongkha" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="dz"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="efi" english_name="Efik" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="egy" english_name="Ancient Egyptian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="eka" english_name="Ekajuk" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="elx" english_name="Elamite" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="eng" english_name="English" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="en"/>
-                        <SYNONYM encoding="DRIVER" term="english"/>
-                        <SYNONYM encoding="DRIVER" term="en_us"/>
-                        <SYNONYM encoding="DRIVER" term="en_en"/>
-                        <SYNONYM encoding="DRIVER" term="en_au"/>
-                        <SYNONYM encoding="DRIVER" term="en_nz"/>
-                        <SYNONYM encoding="DRIVER" term="en_gb"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="enm" english_name="Middle English" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ang" english_name="Old English" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="esk" english_name="Eskimo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="epo" english_name="Esperanto" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="eo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="est" english_name="Estonian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="et"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ewe" english_name="Ewe" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ewo" english_name="Ewondo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fan" english_name="Fang" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fat" english_name="Fanti" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fao" english_name="Faroese" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="fij" english_name="Fijian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fj"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="fin" english_name="Finnish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="fiu" english_name="Finno-Ugrian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fon" english_name="Fon" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fra/fre" english_name="French" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fr"/>
-                        <SYNONYM encoding="DRIVER" term="fr_be"/>
-                        <SYNONYM encoding="DRIVER" term="fr_fr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="frm" english_name="Middle French" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fro" english_name="Old French" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fry" english_name="Frisian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fy"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ful" english_name="Fulah" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gaa" english_name="Ga" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gae/gdh" english_name="Gaelic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="glg" english_name="Gallegan" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="gl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lug" english_name="Ganda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gay" english_name="Gayo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gez" english_name="Geez" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="geo/kat" english_name="Georgian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ka"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="deu/ger" english_name="German" native_name="Deutsch">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="de"/>
-                        <SYNONYM encoding="iso639-1" term="german"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="gmh" english_name="Middle High German" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="goh" english_name="Old High German" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gem" english_name="Germanic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gil" english_name="Gilbertese" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gon" english_name="Gondi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="got" english_name="Gothic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="grb" english_name="Grebo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="grc" english_name="Ancient Greek" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ell/gre" english_name="Greek" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="el"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kal" english_name="Greenlandic" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="kl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="grn" english_name="Guarani" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="gn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="guj" english_name="Gujarati" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="gu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="hai" english_name="Haida" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="hau" english_name="Hausa" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ha"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="haw" english_name="Hawaiian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="heb" english_name="Hebrew" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="he"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="her" english_name="Herero" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="hil" english_name="Hiligaynon" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="him" english_name="Himachali" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="hin" english_name="Hindi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="hmo" english_name="Hiri Motu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="hun" english_name="Hungarian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="hup" english_name="Hupa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="iba" english_name="Iban" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ice/isl" english_name="Icelandic" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="is"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ibo" english_name="Igbo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ijo" english_name="Ijo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ilo" english_name="Iloko" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="inc" english_name="Indic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ine" english_name="Indo-European" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ind" english_name="Indonesian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="id"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ina" english_name="Interlingua" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ia"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ine" english_name="Interlingue" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="-"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="iku" english_name="Inuktitut" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="iu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ipk" english_name="Inupiak" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ik"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ira" english_name="Iranian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gai/iri" english_name="Irish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ga"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="gle" english_name="Irish" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sga" english_name="old Irish" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mga" english_name="Middle Irish" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="iro" english_name="Iroquoian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ita" english_name="Italian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="it"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="jpn" english_name="Japanese" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ja"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="jav/jaw" english_name="Javanese" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="jv/jw"/>
-                        <SYNONYM encoding="iso639-1" term="jv"/>
-                        <SYNONYM encoding="iso639-1" term="jw"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="jrb" english_name="Judeo-Arabic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="jpr" english_name="Judeo-Persian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kab" english_name="Kabyle" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kac" english_name="Kachin" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kam" english_name="Kamba" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kan" english_name="Kannada" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="kn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kau" english_name="Kanuri" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kaa" english_name="Kara-Kalpak" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kar" english_name="Karen" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kas" english_name="Kashmiri" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ks"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kaw" english_name="Kawi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kaz" english_name="Kazakh" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="kk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kha" english_name="Khasi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="khm" english_name="Khmer" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="km"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="khi" english_name="Khoisan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kho" english_name="Khotanese" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kik" english_name="Kikuyu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kin" english_name="Kinyarwanda" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="rw"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kir" english_name="Kirghiz" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ky"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kom" english_name="Komi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kon" english_name="Kongo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kok" english_name="Konkani" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kor" english_name="Korean" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ko"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kpe" english_name="Kpelle" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kro" english_name="Kru" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kua" english_name="Kuanyama" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kum" english_name="Kumyk" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kur" english_name="Kurdish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ku"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kru" english_name="Kurukh" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kus" english_name="Kusaie" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kut" english_name="Kutenai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lad" english_name="Ladino" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lah" english_name="Lahnda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lam" english_name="Lamba" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="oci" english_name="Langue d'Oc" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="oc"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lao" english_name="Lao" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="lo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lat" english_name="Latin" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="la"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lav" english_name="Latvian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="lv"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ltz" english_name="Letzeburgesch" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lez" english_name="Lezghian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lin" english_name="Lingala" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ln"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lit" english_name="Lithuanian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="lt"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="loz" english_name="Lozi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lub" english_name="Luba-Katanga" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lui" english_name="Luiseno" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lun" english_name="Lunda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="luo" english_name="Luo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mac/mak" english_name="Macedonian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mad" english_name="Madurese" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mag" english_name="Magahi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mai" english_name="Maithili" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mak" english_name="Makasar" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mlg" english_name="Malagasy" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mg"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="may/msa" english_name="Malay" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ms"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mal" english_name="Malayalam" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mlt" english_name="Maltese" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ml"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="man" english_name="Mandingo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mni" english_name="Manipuri" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mno" english_name="Manobo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="max" english_name="Manx" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mao/mri" english_name="Maori" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mar" english_name="Marathi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="chm" english_name="Mari" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mah" english_name="Marshall" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mwr" english_name="Marwari" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mas" english_name="Masai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="myn" english_name="Mayan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="men" english_name="Mende" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mic" english_name="Micmac" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="min" english_name="Minangkabau" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mis" english_name="Miscellaneous" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="moh" english_name="Mohawk" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mol" english_name="Moldavian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mkh" english_name="Mon-Kmer" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lol" english_name="Mongo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mon" english_name="Mongolian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mos" english_name="Mossi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mul" english_name="Multiple languages" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mun" english_name="Munda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nau" english_name="Nauru" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="na"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="nav" english_name="Navajo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nde" english_name="Ndebele" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nbl" english_name="Ndebele" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ndo" english_name="Ndongo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nep" english_name="Nepali" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ne"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="new" english_name="Newari" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nic" english_name="Niger-Kordofanian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ssa" english_name="Nilo-Saharan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="niu" english_name="Niuean" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="non" english_name="Norse" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nai" english_name="North American Indian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nor" english_name="Norwegian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="no"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="nno" english_name="Ngomba" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nub" english_name="Nubian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nym" english_name="Nyamwezi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nya" english_name="Nyanja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nyn" english_name="Nyankole" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nyo" english_name="Nyoro" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nzi" english_name="Nzima" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="oji" english_name="Ojibwa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ori" english_name="Oriya" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="or"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="orm" english_name="Oromo" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="om"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="osa" english_name="Osage" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="oss" english_name="Ossetic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="oto" english_name="Otomian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pal" english_name="Pahlavi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pau" english_name="Palauan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pli" english_name="Pali" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pam" english_name="Pampanga" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pag" english_name="Pangasinan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pan" english_name="Panjabi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="pap" english_name="Papiamento" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="paa" english_name="Papuan-Australian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fas/per" english_name="Persian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="peo" english_name="Persian, Old (ca 600 - 400 B.C.)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="phn" english_name="Phoenician" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pol" english_name="Polish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="pon" english_name="Ponape" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="por" english_name="Portuguese" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pt"/>
-                        <SYNONYM encoding="DRIVER" term="pt_pt"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="pra" english_name="Prakrit" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pro" english_name="Provencal" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pus" english_name="Pushto" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ps"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="que" english_name="Quechua" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="qu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="roh" english_name="Rhaeto-Romance" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="rm"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="raj" english_name="Rajasthani" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="rar" english_name="Rarotongan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="roa" english_name="Romance" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ron/rum" english_name="Romanian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ro"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="rom" english_name="Romany" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="run" english_name="Rundi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="rn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="rus" english_name="Russian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ru"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sal" english_name="Salishan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sam" english_name="Samaritan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="smi" english_name="Sami" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="smo" english_name="Samoan" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sm"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sad" english_name="Sandawe" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sag" english_name="Sango" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sg"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="san" english_name="Sanskrit" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="srd" english_name="Sardinian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sco" english_name="Scots" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sel" english_name="Selkup" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sem" english_name="Semitic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="" english_name="Serbian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="scr" english_name="Serbo-Croatian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="srr" english_name="Serbian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="shn" english_name="Shan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sna" english_name="Shona" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sid" english_name="Sidamo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bla" english_name="Siksika" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="snd" english_name="Sindhi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sd"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sin" english_name="Singhalese" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="si"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sit" english_name="Sino-Tibetan" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="-"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sio" english_name="Siouan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sla" english_name="Slavic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ssw" english_name="Siswant" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ss"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="slk/slo" english_name="Slovak" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="slv" english_name="Slovenian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sog" english_name="Sogdian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="som" english_name="Somali" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="so"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="son" english_name="Songhai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="wen" english_name="Sorbian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nso" english_name="Sotho" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sot" english_name="Sotho" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="st"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sai" english_name="South American Indian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="esl/spa" english_name="Spanish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="es"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="suk" english_name="Sukuma" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sux" english_name="Sumerian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sun" english_name="Sudanese" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="su"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sus" english_name="Susu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="swa" english_name="Swahili" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sw"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ssw" english_name="Swazi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sve/swe" english_name="Swedish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sv"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="syr" english_name="Syriac" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tgl" english_name="Tagalog" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tah" english_name="Tahitian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tgk" english_name="Tajik" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tg"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tmh" english_name="Tamashek" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tam" english_name="Tamil" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ta"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tat" english_name="Tatar" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tt"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tel" english_name="Telugu" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="te"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ter" english_name="Tereno" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tha" english_name="Thai" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="th"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bod/tib" english_name="Tibetan" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tig" english_name="Tigre" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tir" english_name="Tigrinya" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ti"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tem" english_name="Timne" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tiv" english_name="Tivi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tli" english_name="Tlingit" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tog" english_name="Tonga(Nyasa)" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="to"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ton" english_name="Tonga(Tonga Islands)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tru" english_name="Truk" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tsi" english_name="Tsimshian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tso" english_name="Tsonga" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ts"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tsn" english_name="Tswana" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tum" english_name="Tumbuka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tur" english_name="Turkish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ota" english_name="Ottoman" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tuk" english_name="Turkmen" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tyv" english_name="Tuvinian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="twi" english_name="Twi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tw"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="uga" english_name="Ugaritic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="uig" english_name="Uighur" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ug"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ukr" english_name="Ukrainian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="uk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="umb" english_name="Umbundu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="und" english_name="Undetermined" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="urd" english_name="Urdu" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ur"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="uzb" english_name="Uzbek" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="uz"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="vai" english_name="Vai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ven" english_name="Venda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="vie" english_name="Vietnamese" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="vi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="vol" english_name="VolapÃƒÂ¼k" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="vo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="vot" english_name="Votic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="wak" english_name="Wakashan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="wal" english_name="Walamo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="wln" english_name="Wallon" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="wa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="war" english_name="Waray" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="was" english_name="Washo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cym/wel" english_name="Welsh" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="cy"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="wol" english_name="Wolof" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="wo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="xho" english_name="Xhosa" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="xh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sah" english_name="Yakut" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="yao" english_name="Yao" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="yap" english_name="Yap" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="yid" english_name="Yiddish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="yi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="yor" english_name="Yoruba" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="yo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="zap" english_name="Zapotec" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="zen" english_name="Zenaga" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="zha" english_name="Zhuang" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="za"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="zul" english_name="Zulu" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="zu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="zun" english_name="Zuni" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-04-03T20:37:24+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/Shortlistoflanguagenames_es_ES.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/Shortlistoflanguagenames_es_ES.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/Shortlistoflanguagenames_es_ES.xml	(nonexistent)
@@ -1,214 +0,0 @@
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value="54dae08c-d67c-4251-8322-2e5d29149ab7_Vm9jYWJ1bGFyeURTUmVzb3VyY2VzL1ZvY2FidWxhcnlEU1Jlc291cmNlVHlwZQ=="/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value=""/>
-        <DATE_OF_CREATION value="2010-12-23T19:06:29+01:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Short list of language names_es_ES</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>ISO 639-2 list of languages. It defines mapping from iso639-1 and DRIVER derived values.</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM encoding="alb/sqi" english_name="Albano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sq"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ara" english_name="Árabe" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ar"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="baq/eus" english_name="Euskera" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="eu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bul" english_name="Búlgaro" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bg"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bel" english_name="Bielorruso" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="be"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="cat" english_name="Catalán" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ca"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="chi/zho" english_name="Chino" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="zh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="" english_name="Croata" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ces/cze" english_name="Checo" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="cs"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="dan" english_name="Danés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="da"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="dut/nla" english_name="Holandés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="nl"/>
-                        <SYNONYM encoding="DRIVER" term="nl_nl"/>
-                        <SYNONYM encoding="DRIVER" term="nl_be"/>
-                        <SYNONYM encoding="DRIVER" term="nld"/>
-                        <SYNONYM encoding="DRIVER" term="dutdut"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="eng" english_name="Inglés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="en"/>
-                        <SYNONYM encoding="DRIVER" term="english"/>
-                        <SYNONYM encoding="DRIVER" term="en_us"/>
-                        <SYNONYM encoding="DRIVER" term="en_en"/>
-                        <SYNONYM encoding="DRIVER" term="en_au"/>
-                        <SYNONYM encoding="DRIVER" term="en_nz"/>
-                        <SYNONYM encoding="DRIVER" term="en_gb"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="epo" english_name="Esperanto" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="eo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="est" english_name="Estonio" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="et"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="fin" english_name="Finlandés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="fra/fre" english_name="Francés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fr"/>
-                        <SYNONYM encoding="DRIVER" term="fr_be"/>
-                        <SYNONYM encoding="DRIVER" term="fr_fr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="deu/ger" english_name="Alemán" native_name="Deutsch">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="de"/>
-                        <SYNONYM encoding="iso639-1" term="german"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ell/gre" english_name="Griego" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="el"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="hun" english_name="Húngaro" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ice/isl" english_name="Islandés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="is"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ita" english_name="Italiano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="it"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="jpn" english_name="Japonés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ja"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lat" english_name="Latín" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="la"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mon" english_name="Mongol" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mul" english_name="Múltiples idiomas" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nep" english_name="Nepalí" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ne"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="nor" english_name="Noruego" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="no"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="pol" english_name="Polaco" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="por" english_name="Portugués" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pt"/>
-                        <SYNONYM encoding="DRIVER" term="pt_pt"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ron/rum" english_name="Rumano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ro"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="rus" english_name="Ruso" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ru"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="slk/slo" english_name="Eslovako" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="slv" english_name="Esloveno" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="esl/spa" english_name="Español" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="es"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sve/swe" english_name="Sueco" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sv"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="cym/wel" english_name="Galés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="cy"/>
-                    </SYNONYMS>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2007-04-27T16:45:24+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
-
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/Shortlistoflanguagenames.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/Shortlistoflanguagenames.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/Shortlistoflanguagenames.xml	(nonexistent)
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value="1-524b117b-c3fe-4355-b6d9-50e87036455f_Vm9jYWJ1bGFyeURTUmVzb3VyY2VzL1ZvY2FidWxhcnlEU1Jlc291cmNlVHlwZQ=="/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value=""/>
-        <DATE_OF_CREATION value="2008-03-11T16:29:38+01:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Short list of language names</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>ISO 639-2 list of languages. It defines mapping from iso639-1 and DRIVER derived values.</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM english_name="Albanian" encoding="alb/sqi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="sq" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ara" english_name="Arabic" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="ar" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Basque" encoding="baq/eus" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="eu" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="bul" english_name="Bulgarian">
-                    <SYNONYMS>
-                        <SYNONYM term="bg" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Byelorussian" encoding="bel">
-                    <SYNONYMS>
-                        <SYNONYM term="be" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="cat" english_name="Catalan" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ca"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="chi/zho" native_name="" english_name="Chinese">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="zh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Croatian" encoding="">
-                    <SYNONYMS>
-                        <SYNONYM term="hr" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Czech" encoding="ces/cze">
-                    <SYNONYMS>
-                        <SYNONYM term="cs" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Danish" native_name="" encoding="dan">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="da"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Dutch" encoding="dut/nla">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="nl"/>
-                        <SYNONYM term="nl_nl" encoding="DRIVER"/>
-                        <SYNONYM encoding="DRIVER" term="nl_be"/>
-                        <SYNONYM encoding="DRIVER" term="nld"/>
-                        <SYNONYM term="dutdut" encoding="DRIVER"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="English" native_name="" encoding="eng">
-                    <SYNONYMS>
-                        <SYNONYM term="en" encoding="iso639-1"/>
-                        <SYNONYM term="english" encoding="DRIVER"/>
-                        <SYNONYM term="en_us" encoding="DRIVER"/>
-                        <SYNONYM term="en_en" encoding="DRIVER"/>
-                        <SYNONYM encoding="DRIVER" term="en_au"/>
-                        <SYNONYM encoding="DRIVER" term="en_nz"/>
-                        <SYNONYM encoding="DRIVER" term="en_gb"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="epo" native_name="" english_name="Esperanto">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="eo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="est" english_name="Estonian">
-                    <SYNONYMS>
-                        <SYNONYM term="et" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Finnish" encoding="fin">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="fra/fre" english_name="French">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fr"/>
-                        <SYNONYM encoding="DRIVER" term="fr_be"/>
-                        <SYNONYM encoding="DRIVER" term="fr_fr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="German" encoding="deu/ger" native_name="Deutsch">
-                    <SYNONYMS>
-                        <SYNONYM term="de" encoding="iso639-1"/>
-                        <SYNONYM term="german" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ell/gre" native_name="" english_name="Greek">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="el"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="hun" native_name="" english_name="Hungarian">
-                    <SYNONYMS>
-                        <SYNONYM term="hu" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Icelandic" encoding="ice/isl" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="is" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Italian" encoding="ita">
-                    <SYNONYMS>
-                        <SYNONYM term="it" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Japanese" encoding="jpn">
-                    <SYNONYMS>
-                        <SYNONYM term="ja" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="lat" english_name="Latin">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="la"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Mongolian" encoding="mon">
-                    <SYNONYMS>
-                        <SYNONYM term="mn" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Multiple languages" encoding="mul" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nep" native_name="" english_name="Nepali">
-                    <SYNONYMS>
-                        <SYNONYM term="ne" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="nor" english_name="Norwegian">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="no"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Polish" native_name="" encoding="pol">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="por" english_name="Portuguese">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pt"/>
-                        <SYNONYM encoding="DRIVER" term="pt_pt"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ron/rum" english_name="Romanian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ro"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Russian" native_name="" encoding="rus">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ru"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="slk/slo" native_name="" english_name="Slovak">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Slovenian" native_name="" encoding="slv">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Spanish" encoding="esl/spa" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="es" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="sve/swe" english_name="Swedish">
-                    <SYNONYMS>
-                        <SYNONYM term="sv" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Welsh" encoding="cym/wel" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="cy"/>
-                    </SYNONYMS>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2007-04-27T16:45:24+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/NamesofTextObjectTypologies_pl_PL.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/NamesofTextObjectTypologies_pl_PL.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/NamesofTextObjectTypologies_pl_PL.xml	(nonexistent)
@@ -1,116 +0,0 @@
-<RESOURCE_PROFILE xmlns:xsi="http://www.w2.org/2001/XMLSchema-instance">
-    <HEADER>
-        <RESOURCE_IDENTIFIER value="e86f2220-5e5b-47e7-bb52-f085a3048313_Vm9jYWJ1bGFyeURTUmVzb3VyY2VzL1ZvY2FidWxhcnlEU1Jlc291cmNlVHlwZQ=="/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2011-09-28T09:44:08+00:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Names of Text Object Typologies_pl_PL</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>List of typology types provided by the DRIVER Guidelines for Repository content</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM encoding="0000" english_name="Nieznany" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0001" english_name="Artykuł" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVER" term="Artykuł w monografii"/>
-                        <SYNONYM encoding="DRIVER" term="Artykuł/List do redakcji"/>
-                        <SYNONYM encoding="DRIVER" term="Artykuł / List do redakcji"/>
-                        <SYNONYM encoding="DRIVER" term="Artykuł / List do redakcji"/>
-                        <SYNONYM encoding="DRIVER" term="Artykuł-list do redakcji"/>
-                        <SYNONYM encoding="DRIVER" term="Artykuł - list do redakcji"/>
-                        <SYNONYM encoding="DRIVER" term="Artykuł w czasopiśmie"/>
-                        <SYNONYM encoding="DRIVER" term="Artykuł w czasopiśmie (internetowym lub drukowanym)"/>
-                        <SYNONYM encoding="DRIVER" term="Artykuł zrecenzowany"/>
-                        <SYNONYM encoding="DRIVER" term="Artykuł / Gazeta"/>
-                        <SYNONYM encoding="DRIVER" term="Autykuł"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0002" english_name="Książka" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVER" term="Książka (monografia)"/>
-                        <SYNONYM encoding="DRIVER" term="Książka - monografia"/>
-                        <SYNONYM encoding="DRIVER" term="Część książki"/>
-                        <SYNONYM encoding="DRIVER" term="Monografia"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0003" english_name="Wykład konferencyjny" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0004" english_name="Materiał konferencyjny" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVER" term="Materiał z workshopu"/>
-                        <SYNONYM encoding="DRIVER" term="Referat konferencyjny"/>
-                        <SYNONYM encoding="DRIVER" term="Wystąpienie na konferencji"/>
-                        <SYNONYM encoding="DRIVER" term="Referat konferencyjny"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0005" english_name="Artykuł w dzienniku lub tygodniku" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0006" english_name="Doktorat" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DINI" term="Tekst.Rozprawa.Doktorska"/>
-                        <SYNONYM encoding="DRIVER" term="Rozprawa.Doktorska"/>
-                        <SYNONYM encoding="DRIVER" term="Dysertacja"/>
-                        <SYNONYM encoding="DRIVER" term="Dys"/>
-                        <SYNONYM encoding="DRIVER" term="DoktorskaRozprawa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0007" english_name="Praca magisterska" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DINI" term="Praca-Magisterska.Magister"/>
-                        <SYNONYM encoding="DRIVER" term="Rozprawa.Magisterska"/>
-                        <SYNONYM encoding="DRIVER" term="Magisterska rozprawa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0008" english_name="Praca licencjacka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0009" english_name="Raport z badań" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DINI" term="Raport techniczny"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0010" english_name="Wykład" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DINI" term="Wykład publiczny"/>
-                        <SYNONYM encoding="DRIVER" term="Wykład inauguracyjny"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0011" english_name="Raport wewnętrzny" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0012" english_name="Newsletter" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0013" english_name="Część książki lub rozdział książki" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVER" term="Część książki - rozdział"/>
-                        <SYNONYM encoding="DRIVER" term="Wstęp do książki"/>
-                        <SYNONYM encoding="DRIVER" term="Część książki"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0014" english_name="Referat" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0015" english_name="Wzbogacona publikacja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0016" english_name="Zbiór" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0017" english_name="Dane badawcze" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2007-05-06T23:02:07+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS/>
-    </BODY>
-</RESOURCE_PROFILE>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/NamesofCountries_pl_PL.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/NamesofCountries_pl_PL.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/NamesofCountries_pl_PL.xml	(nonexistent)
@@ -1,762 +0,0 @@
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value="3-959aed5b-9ccc-40ff-9791-352d05098cdd_Vm9jYWJ1bGFyeURTUmVzb3VyY2VzL1ZvY2FidWxhcnlEU1Jlc291cmNlVHlwZQ=="/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2009-06-25T14:50:49+02:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Names of Countries_pl_PL</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>OASIS list of country codes Country Code List: ISO 3166-1993 (E). No mappings provided.</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM encoding="AD" english_name="Andora" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AE" english_name="Zjednoczone Emiraty Arabskie" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AF" english_name="Afganistan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AG" english_name="Antigua i Barbuda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AI" english_name="Anguilla" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AL" english_name="Albania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AM" english_name="Armenia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AN" english_name="Antyle Holenderskie" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AO" english_name="Angola" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AQ" english_name="Antarktyda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AR" english_name="Argentyna" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AS" english_name="Samoa Amerykańskie" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AT" english_name="Austria" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AU" english_name="Australia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AW" english_name="Aruba" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AZ" english_name="Azerbejdżan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BA" english_name="Bonia i Hercegowina" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BB" english_name="Barbados" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BD" english_name="Bangladesz" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BE" english_name="Belgia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BF" english_name="Burkina Faso" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BG" english_name="Bułgaria" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BH" english_name="Bahrajn" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BI" english_name="Burundi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BJ" english_name="Benin" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BM" english_name="Bermudy" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BN" english_name="Brunei" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BO" english_name="Boliwia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BR" english_name="Brazylia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BS" english_name="Bahamy" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BT" english_name="Bhutan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BU" english_name="Burma" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BV" english_name="Wyspy Bouveta" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BW" english_name="Botswana" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BY" english_name="Białoru" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BZ" english_name="Belize" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CA" english_name="Kanada" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CC" english_name="Wyspy Kokosowe" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CF" english_name="Republika rodkowoafrykańska" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CG" english_name="Demokratyczna Republika Konga" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CH" english_name="Szwajcaria" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CI" english_name="Wybrzeże Koci Słoniowej" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CK" english_name="Wyspy Cooka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CL" english_name="Chile" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CM" english_name="Kamerun" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CN" english_name="Chiny" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CO" english_name="Kolumbia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CR" english_name="Kostaryka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CS" english_name="Czechosłowacja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CU" english_name="Kuba" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CV" english_name="Republika Zielonego Przylšdka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CX" english_name="Wyspa Bożego Narodzenia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CY" english_name="Cypr" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CZ" english_name="Czechy" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DD" english_name="Niemiecka Republika Demokratyczna (nie istnieje)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DE" english_name="Niemcy" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DJ" english_name="Dżibuti" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DK" english_name="Dania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DM" english_name="Dominika" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DO" english_name="Dominikana" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DZ" english_name="Algieria" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="EC" english_name="Ekwador" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="EE" english_name="Estonia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="EG" english_name="Egipt" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="EH" english_name="Sahara Zachodnia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ER" english_name="Erytrea" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ES" english_name="Hiszpania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ET" english_name="Etiopia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FI" english_name="Finlandia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FJ" english_name="Fidżi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FK" english_name="Falklandy" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FM" english_name="Mikronezja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FO" english_name="Wyspy Owcze" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FR" english_name="Francja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FX" english_name="Francja metropolitarna" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GA" english_name="Gabon" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UK" english_name="Wielka Brytania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GD" english_name="Grenada" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GE" english_name="Gruzja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GF" english_name="Gujana Francuska" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GH" english_name="Ghana" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GI" english_name="Gibraltar" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GL" english_name="Grenlandia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GM" english_name="Gambia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GN" english_name="Gwinea" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GP" english_name="Gwadelupa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GQ" english_name="Gwinea Równikowa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GR" english_name="Grecja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GS" english_name="Georgia Południowa i Sandwich Południowy" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GT" english_name="Gwatemala" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GU" english_name="Guam" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GW" english_name="Gwinea Bissau" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GY" english_name="Gujana" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HK" english_name="Hongkong" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HM" english_name="Wyspy Heard i McDonald" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HN" english_name="Honduras" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HR" english_name="Chorwacja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HT" english_name="Haiti" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HU" english_name="Węgry" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ID" english_name="Indonezja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IE" english_name="Irlandia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IL" english_name="Izrael" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IN" english_name="Indie" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IO" english_name="Brytyjskie Terytorium Oceanu Indyjskiego" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IQ" english_name="Irak" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IR" english_name="Iran" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IS" english_name="Islandia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IT" english_name="Włochy" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="JM" english_name="Jamajka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="JO" english_name="Jordania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="JP" english_name="Japonia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KE" english_name="Kenia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KG" english_name="Kirgistan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KH" english_name="Kambodża" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KI" english_name="Kiribati" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KM" english_name="Komory" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KN" english_name="St. Kitts i Nevis" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KP" english_name="Korea Północna" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KR" english_name="Korea Południowa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KW" english_name="Kuwejt" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KY" english_name="Kajmany" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KZ" english_name="Kazachstan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LA" english_name="Laos" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LB" english_name="Liban" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LC" english_name="Saint Lucia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LI" english_name="Liechtenstein" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LK" english_name="Sri Lanka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LR" english_name="Liberia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LS" english_name="Lesotho" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LT" english_name="Litwa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LU" english_name="Luksemburg" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LV" english_name="Łotwa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LY" english_name="Libia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MA" english_name="Maroko" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MC" english_name="Monaco" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MD" english_name="Mołdawia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MG" english_name="Madagaskar" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MG" english_name="Madagaskar" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MH" english_name="Wyspy Marshalla" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ML" english_name="Mali" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MN" english_name="Mongolia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MM" english_name="Birma" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MO" english_name="Makau" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MP" english_name="Mariany Północne" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MQ" english_name="Martynika" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MR" english_name="Mauretania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MS" english_name="Monserrat" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MT" english_name="Malta" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MU" english_name="Mauritius" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MV" english_name="Malediwy" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MW" english_name="Malawi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MX" english_name="Meksyk" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MY" english_name="Malezja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MZ" english_name="Mozambik" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NA" english_name="Namibia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NC" english_name="Nowa Kaledonia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NE" english_name="Niger" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NF" english_name="Norfolk" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NG" english_name="Nigeria" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NI" english_name="Nikaragua" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NL" english_name="Holandia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NO" english_name="Norwegia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NP" english_name="Nepal" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NR" english_name="Nauru" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NT" english_name="Strefa neutralna (nie istnieje)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NU" english_name="Niue" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NZ" english_name="Nowa Zelandia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="OM" english_name="Oman" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PA" english_name="Panama" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PE" english_name="Peru" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PF" english_name="Polinezja Francuska" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PG" english_name="Papua-Nowa Gwinea" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PH" english_name="Filipiny" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PK" english_name="Pakistan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PL" english_name="Polska" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PM" english_name="St. Pierre i Miquelon" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PN" english_name="Pitcairn" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PR" english_name="Portoryko" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PT" english_name="Portugalia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PW" english_name="Palau" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PY" english_name="Paragwaj" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="QA" english_name="Katar" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="RE" english_name="R&amp;eacute;union" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="RO" english_name="Rumunia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="RU" english_name="Rosja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="RW" english_name="Rwanda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SA" english_name="Arabia Saudyjska" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SB" english_name="Wyspy Salomona" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SC" english_name="Seszele" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SD" english_name="Sudan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SE" english_name="Szwecja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SG" english_name="Singapur" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SH" english_name="Wyspa w. Heleny" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SI" english_name="Słowenia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SJ" english_name="Svalbard i Jan Mayen" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SK" english_name="Słowacja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SL" english_name="Sierra Leone" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SM" english_name="San Marino" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SN" english_name="Senegal" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SO" english_name="Somalia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SR" english_name="Surinam" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ST" english_name="Wyspy więtego Tomasza i Ksišżęca" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SU" english_name="Zwišzek Socjalistycznych Republik Radzieckich (nie istnieje)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SV" english_name="Salwador" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SY" english_name="Syria" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SZ" english_name="Suazi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TC" english_name="Turks i Caicos" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TD" english_name="Czad" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TF" english_name="Francuskie Terytoria Południowe i Antarktyczne" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TG" english_name="Togo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TH" english_name="Tailandia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TJ" english_name="Tadżykistan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TK" english_name="Tokelau" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TM" english_name="Turkmenistan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TN" english_name="Tunezja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TO" english_name="Tonga" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TP" english_name="Timor Wschodni" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TR" english_name="Turcja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TT" english_name="Trynidad i Tobago" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TV" english_name="Tuvalu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TW" english_name="Tajwan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TZ" english_name="Tanzania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UA" english_name="Ukraina" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UG" english_name="Uganda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UM" english_name="Dalekie Wyspy Mniejsze Stanów Zjednoczonych" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="US" english_name="Stany Zjednoczone" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="US" english_name="Stany Zjednoczone" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UY" english_name="Urugwaj" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UZ" english_name="Uzbekistan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VA" english_name="Watykan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VC" english_name="St. Vincent i Grenadyny" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VE" english_name="Wenezuela" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VG" english_name="Brytyjskie Wyspy Dziewicze" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VI" english_name="Wyspy Dziewicze Stanów Zjednoczonych" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VN" english_name="Wietnam" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VU" english_name="Vanuatu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="WF" english_name="Wallis i Futuna" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="WS" english_name="Samoa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="YD" english_name="Jemen Demokratyczny (nie istnieje)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="YE" english_name="Jemen" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="YT" english_name="Majotta" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="YU" english_name="Jugosławia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ZA" english_name="Republika Południowej Afryki" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ZM" english_name="Zambia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ZR" english_name="Zair" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ZW" english_name="Zimbabwe" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ZZ" english_name="Nieznane lub nieokrelone państwo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-06-25T14:50:49+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/NamesofLanguages_es_ES.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/NamesofLanguages_es_ES.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/NamesofLanguages_es_ES.xml	(nonexistent)
@@ -1,1534 +0,0 @@
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value="5643626a-0276-4734-ad06-9d93c8595539_Vm9jYWJ1bGFyeURTUmVzb3VyY2VzL1ZvY2FidWxhcnlEU1Jlc291cmNlVHlwZQ=="/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value=""/>
-        <DATE_OF_CREATION value="2010-12-23T19:06:56+01:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Names of Languages_es_ES</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>ISO 639-2 list of languages. It defines mapping from iso639-1 and DRIVER derived values.</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM encoding="abk" english_name="Abkhaziano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ab"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ace" english_name="Achinese" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ach" english_name="Acoli" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ada" english_name="Adangme" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="aar" english_name="Afar" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="aa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="afh" english_name="Afrihili" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="afr" english_name="Afrikaans" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="af"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="afa" english_name="Afro-Asiatic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="aka" english_name="Akan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="akk" english_name="Akkadian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="alb/sqi" english_name="Albano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sq"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ale" english_name="Aleut" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="alg" english_name="Algonquian languages" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tut" english_name="Altaic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="amh" english_name="Amárico" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="am"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="apa" english_name="Apache" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ara" english_name="Árabe" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ar"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="arc" english_name="Aramaic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="arp" english_name="Arapaho" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="arn" english_name="Araucanian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="arw" english_name="Arawak" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="arm/hye" english_name="Armenio" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hy"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="art" english_name="Artificial" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="asm" english_name="Asamés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="as"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ath" english_name="Athapascan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="map" english_name="Austronesian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ava" english_name="Avaric" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ave" english_name="Avestan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="awa" english_name="Awadhi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="aym" english_name="Aymará" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ay"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="aze" english_name="Azerí" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="az"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="nah" english_name="Aztec" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ban" english_name="Balinese" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bat" english_name="Baltic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bal" english_name="Baluchi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bam" english_name="Bambara" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bai" english_name="Bamileke" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bad" english_name="Banda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bnt" english_name="Bantu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bas" english_name="Basa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bak" english_name="Bashkir" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ba"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="baq/eus" english_name="Euskera" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="eu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bej" english_name="Beja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bem" english_name="Bemba" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ben" english_name="Bengalí" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ber" english_name="Berber" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bho" english_name="Bhojpuri" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bih" english_name="Bihari" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bik" english_name="Bikol" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bin" english_name="Bini" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bis" english_name="Bislama" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bra" english_name="Braj" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bre" english_name="Bretón" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="br"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bug" english_name="Buginese" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bul" english_name="Búlgaro" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bg"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bua" english_name="Buriat" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bur/mya" english_name="Birmano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="my"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bel" english_name="Bielorruso" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="be"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="cad" english_name="Caddo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="car" english_name="Carib" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cat" english_name="Catalán" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ca"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="cau" english_name="Caucasian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ceb" english_name="Cebuano" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cel" english_name="Celtic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cai" english_name="Central American Indian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chg" english_name="Chagatai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cha" english_name="Chamorro" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="che" english_name="Chechen" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chr" english_name="Cherokee" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chy" english_name="Cheyenne" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chb" english_name="Chibcha" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chi/zho" english_name="Chino" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="zh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="chn" english_name="Chinook jargon" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cho" english_name="Choctaw" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chu" english_name="Church Slavic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chv" english_name="Chuvash" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cop" english_name="Coptic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cor" english_name="Cornish" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cos" english_name="Corso" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="co"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="cre" english_name="Cree" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mus" english_name="Creek" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="crp" english_name="Creoles and Pidgins" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cpe" english_name="English-based Creoles and Pidgins" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cpf" english_name="French-based Creoles and Pidgins" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cpp" english_name="Portuguese-based Creoles and Pidgins" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cus" english_name="Cushitic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="" english_name="Croata" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ces/cze" english_name="Checo" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="cs"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="dak" english_name="Dakota" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dan" english_name="Danés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="da"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="del" english_name="Delaware" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="din" english_name="Dinka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="div" english_name="Divehi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="doi" english_name="Dogri" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dra" english_name="Dravidian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dua" english_name="Duala" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dut/nla" english_name="Holandés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="nl"/>
-                        <SYNONYM encoding="DRIVER" term="nl_nl"/>
-                        <SYNONYM encoding="DRIVER" term="nl_be"/>
-                        <SYNONYM encoding="DRIVER" term="nld"/>
-                        <SYNONYM encoding="DRIVER" term="dutdut"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="dum" english_name="Middle Dutch" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dyu" english_name="Dyula" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dzo" english_name="Dzongkha" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="dz"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="efi" english_name="Efik" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="egy" english_name="Ancient Egyptian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="eka" english_name="Ekajuk" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="elx" english_name="Elamite" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="eng" english_name="Inglés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="en"/>
-                        <SYNONYM encoding="DRIVER" term="english"/>
-                        <SYNONYM encoding="DRIVER" term="en_us"/>
-                        <SYNONYM encoding="DRIVER" term="en_en"/>
-                        <SYNONYM encoding="DRIVER" term="en_au"/>
-                        <SYNONYM encoding="DRIVER" term="en_nz"/>
-                        <SYNONYM encoding="DRIVER" term="en_gb"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="enm" english_name="Middle English" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ang" english_name="Old English" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="esk" english_name="Eskimo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="epo" english_name="Esperanto" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="eo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="est" english_name="Estonio" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="et"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ewe" english_name="Ewe" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ewo" english_name="Ewondo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fan" english_name="Fang" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fat" english_name="Fanti" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fao" english_name="Feroés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="fij" english_name="Fijian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fj"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="fin" english_name="Finlandés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="fiu" english_name="Finno-Ugrian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fon" english_name="Fon" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fra/fre" english_name="Francés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fr"/>
-                        <SYNONYM encoding="DRIVER" term="fr_be"/>
-                        <SYNONYM encoding="DRIVER" term="fr_fr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="frm" english_name="Middle French" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fro" english_name="Old French" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fry" english_name="Frisio" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fy"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ful" english_name="Fulah" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gaa" english_name="Ga" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gae/gdh" english_name="Gaélico" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="glg" english_name="Gallego" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="gl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lug" english_name="Ganda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gay" english_name="Gayo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gez" english_name="Geez" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="geo/kat" english_name="Georgiano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ka"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="deu/ger" english_name="Alemán" native_name="Deutsch">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="de"/>
-                        <SYNONYM encoding="iso639-1" term="german"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="gmh" english_name="Middle High German" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="goh" english_name="Old High German" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gem" english_name="Germanic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gil" english_name="Gilbertese" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gon" english_name="Gondi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="got" english_name="Gothic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="grb" english_name="Grebo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="grc" english_name="Griego Clásico" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ell/gre" english_name="Griego" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="el"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kal" english_name="Groenlandés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="kl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="grn" english_name="Guaraní" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="gn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="guj" english_name="Gujarati" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="gu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="hai" english_name="Haida" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="hau" english_name="Hausa" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ha"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="haw" english_name="Hawaiian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="heb" english_name="Hebreo" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="he"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="her" english_name="Herero" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="hil" english_name="Hiligaynon" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="him" english_name="Himachali" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="hin" english_name="Hindi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="hmo" english_name="Hiri Motu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="hun" english_name="Húngaro" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="hup" english_name="Hupa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="iba" english_name="Iban" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ice/isl" english_name="Islandés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="is"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ibo" english_name="Igbo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ijo" english_name="Ijo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ilo" english_name="Iloko" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="inc" english_name="Indic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ine" english_name="Indo-European" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ind" english_name="Indonesio" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="id"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ina" english_name="Interlingua" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ia"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ine" english_name="Interlingue" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="-"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="iku" english_name="Inuktitut" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="iu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ipk" english_name="Inupiak" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ik"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ira" english_name="Iranian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gai/iri" english_name="Irlandés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ga"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="gle" english_name="Irish" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sga" english_name="old Irish" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mga" english_name="Middle Irish" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="iro" english_name="Iroquoian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ita" english_name="Italiano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="it"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="jpn" english_name="Japonés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ja"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="jav/jaw" english_name="Javanés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="jv/jw"/>
-                        <SYNONYM encoding="iso639-1" term="jv"/>
-                        <SYNONYM encoding="iso639-1" term="jw"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="jrb" english_name="Judeo-Arabic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="jpr" english_name="Judeo-Persian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kab" english_name="Kabyle" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kac" english_name="Kachin" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kam" english_name="Kamba" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kan" english_name="Kannada" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="kn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kau" english_name="Kanuri" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kaa" english_name="Kara-Kalpak" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kar" english_name="Karen" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kas" english_name="Kashmiri" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ks"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kaw" english_name="Kawi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kaz" english_name="Kazaj" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="kk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kha" english_name="Khasi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="khm" english_name="Khmer" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="km"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="khi" english_name="Khoisan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kho" english_name="Khotanese" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kik" english_name="Kikuyu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kin" english_name="Kinyarwanda" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="rw"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kir" english_name="Kirghiz" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ky"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kom" english_name="Komi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kon" english_name="Kongo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kok" english_name="Konkani" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kor" english_name="Coreano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ko"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kpe" english_name="Kpelle" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kro" english_name="Kru" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kua" english_name="Kuanyama" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kum" english_name="Kumyk" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kur" english_name="Kurdo" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ku"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kru" english_name="Kurukh" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kus" english_name="Kusaie" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kut" english_name="Kutenai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lad" english_name="Ladino" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lah" english_name="Lahnda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lam" english_name="Lamba" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="oci" english_name="Lengua de Oc" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="oc"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lao" english_name="Lao" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="lo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lat" english_name="Latín" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="la"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lav" english_name="Letón" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="lv"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ltz" english_name="Letzeburgesch" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lez" english_name="Lezghian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lin" english_name="Lingala" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ln"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lit" english_name="Lituano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="lt"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="loz" english_name="Lozi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lub" english_name="Luba-Katanga" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lui" english_name="Luiseno" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lun" english_name="Lunda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="luo" english_name="Luo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mac/mak" english_name="Macedonio" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mad" english_name="Madurese" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mag" english_name="Magahi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mai" english_name="Maithili" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mak" english_name="Makasar" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mlg" english_name="Malgache" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mg"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="may/msa" english_name="Malayo" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ms"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mal" english_name="Malayalam" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mlt" english_name="Maltés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ml"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="man" english_name="Mandingo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mni" english_name="Manipuri" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mno" english_name="Manobo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="max" english_name="Manx" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mao/mri" english_name="Maorí" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mar" english_name="Marathi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="chm" english_name="Mari" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mah" english_name="Marshall" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mwr" english_name="Marwari" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mas" english_name="Masai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="myn" english_name="Mayan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="men" english_name="Mende" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mic" english_name="Micmac" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="min" english_name="Minangkabau" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mis" english_name="Miscellaneous" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="moh" english_name="Mohawk" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mol" english_name="Moldavian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mkh" english_name="Mon-Kmer" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lol" english_name="Mongo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mon" english_name="Mongol" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mos" english_name="Mossi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mul" english_name="Multiple languages" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mun" english_name="Munda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nau" english_name="Naurí" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="na"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="nav" english_name="Navajo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nde" english_name="Ndebele" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nbl" english_name="Ndebele" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ndo" english_name="Ndongo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nep" english_name="Nepalés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ne"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="new" english_name="Newari" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nic" english_name="Niger-Kordofanian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ssa" english_name="Nilo-Saharan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="niu" english_name="Niuean" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="non" english_name="Norse" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nai" english_name="North American Indian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nor" english_name="Noruego" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="no"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="nno" english_name="Ngomba" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nub" english_name="Nubian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nym" english_name="Nyamwezi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nya" english_name="Nyanja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nyn" english_name="Nyankole" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nyo" english_name="Nyoro" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nzi" english_name="Nzima" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="oji" english_name="Ojibwa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ori" english_name="Oriya" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="or"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="orm" english_name="Oromo" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="om"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="osa" english_name="Osage" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="oss" english_name="Ossetic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="oto" english_name="Otomian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pal" english_name="Pahlavi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pau" english_name="Palauan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pli" english_name="Pali" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pam" english_name="Pampanga" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pag" english_name="Pangasinan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pan" english_name="Panjabi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="pap" english_name="Papiamento" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="paa" english_name="Papuan-Australian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fas/per" english_name="Persa" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="peo" english_name="Persian, Old (ca 600 - 400 B.C.)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="phn" english_name="Phoenician" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pol" english_name="Polaco" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="pon" english_name="Ponape" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="por" english_name="Portugués" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pt"/>
-                        <SYNONYM encoding="DRIVER" term="pt_pt"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="pra" english_name="Prakrit" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pro" english_name="Provencal" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pus" english_name="Pushto" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ps"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="que" english_name="Quechua" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="qu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="roh" english_name="Rhaeto-Romance" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="rm"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="raj" english_name="Rajasthani" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="rar" english_name="Rarotongan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="roa" english_name="Romance" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ron/rum" english_name="Rumano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ro"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="rom" english_name="Romany" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="run" english_name="Rundi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="rn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="rus" english_name="Ruso" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ru"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sal" english_name="Salishan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sam" english_name="Samaritan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="smi" english_name="Sami" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="smo" english_name="Samoan" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sm"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sad" english_name="Sandawe" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sag" english_name="Sango" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sg"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="san" english_name="Sánscrito" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="srd" english_name="Sardinian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sco" english_name="Scots" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sel" english_name="Selkup" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sem" english_name="Semitic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="" english_name="Serbio" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="scr" english_name="Serbo-Croata" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="srr" english_name="Serbian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="shn" english_name="Shan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sna" english_name="Shona" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sid" english_name="Sidamo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bla" english_name="Siksika" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="snd" english_name="Sindhi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sd"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sin" english_name="Singhalese" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="si"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sit" english_name="Sino-Tibetan" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="-"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sio" english_name="Siouan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sla" english_name="Slavic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ssw" english_name="Siswant" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ss"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="slk/slo" english_name="Eslovaco" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="slv" english_name="Esloveno" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sog" english_name="Sogdian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="som" english_name="Somalí" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="so"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="son" english_name="Songhai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="wen" english_name="Sorbian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nso" english_name="Sotho" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sot" english_name="Sotho" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="st"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sai" english_name="South American Indian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="esl/spa" english_name="Español" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="es"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="suk" english_name="Sukuma" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sux" english_name="Sumerian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sun" english_name="Sudanés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="su"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sus" english_name="Susu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="swa" english_name="Swahili" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sw"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ssw" english_name="Swazi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sve/swe" english_name="Sueco" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sv"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="syr" english_name="Syriac" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tgl" english_name="Tagalo" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tah" english_name="Tahitian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tgk" english_name="Tajik" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tg"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tmh" english_name="Tamashek" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tam" english_name="Tamil" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ta"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tat" english_name="Tatar" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tt"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tel" english_name="Telugu" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="te"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ter" english_name="Tereno" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tha" english_name="Tailandés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="th"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bod/tib" english_name="Tibetano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tig" english_name="Tigre" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tir" english_name="Tigrinya" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ti"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tem" english_name="Timne" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tiv" english_name="Tivi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tli" english_name="Tlingit" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tog" english_name="Tonga(Nyasa)" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="to"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ton" english_name="Tonga(Tonga Islands)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tru" english_name="Truk" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tsi" english_name="Tsimshian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tso" english_name="Tsonga" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ts"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tsn" english_name="Tswana" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tum" english_name="Tumbuka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tur" english_name="Turko" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ota" english_name="Ottoman" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tuk" english_name="Turkmen" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tyv" english_name="Tuvinian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="twi" english_name="Twi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tw"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="uga" english_name="Ugaritic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="uig" english_name="Uighur" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ug"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ukr" english_name="Ucraniano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="uk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="umb" english_name="Umbundu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="und" english_name="Undetermined" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="urd" english_name="Urdu" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ur"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="uzb" english_name="Uzbeko" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="uz"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="vai" english_name="Vai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ven" english_name="Venda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="vie" english_name="Vietnamita" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="vi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="vol" english_name="VolapÃƒÂ¼k" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="vo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="vot" english_name="Votic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="wak" english_name="Wakashan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="wal" english_name="Walamo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="wln" english_name="Wallon" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="wa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="war" english_name="Waray" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="was" english_name="Washo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cym/wel" english_name="Galés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="cy"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="wol" english_name="Wolof" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="wo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="xho" english_name="Xhosa" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="xh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sah" english_name="Yakut" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="yao" english_name="Yao" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="yap" english_name="Yap" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="yid" english_name="Yiddish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="yi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="yor" english_name="Yoruba" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="yo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="zap" english_name="Zapotec" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="zen" english_name="Zenaga" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="zha" english_name="Zhuang" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="za"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="zul" english_name="Zulú" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="zu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="zun" english_name="Zuni" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-04-03T20:37:24+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
-
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/Shortlistoflanguagenames_pl_PL.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/Shortlistoflanguagenames_pl_PL.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/Shortlistoflanguagenames_pl_PL.xml	(nonexistent)
@@ -1,213 +0,0 @@
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value="1-524b117b-c3fe-4355-b6d9-50e87036455f_Vm9jYWJ1bGFyeURTUmVzb3VyY2VzL1ZvY2FidWxhcnlEU1Jlc291cmNlVHlwZQ=="/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value=""/>
-        <DATE_OF_CREATION value="2008-03-11T16:29:38+01:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Short list of language names_pl_PL</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>ISO 639-2 list of languages. It defines mapping from iso639-1 and DRIVER derived values.</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM encoding="alb/sqi" english_name="albański" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sq"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ara" english_name="arabski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ar"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="baq/eus" english_name="baskijski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="eu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bul" english_name="bułgarski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bg"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bel" english_name="białoruski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="be"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="cat" english_name="kataloński" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ca"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="chi/zho" english_name="chiński" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="zh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="" english_name="chorwacki" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ces/cze" english_name="czeski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="cs"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="dan" english_name="duński" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="da"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="dut/nla" english_name="holenderski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="nl"/>
-                        <SYNONYM encoding="DRIVER" term="nl_nl"/>
-                        <SYNONYM encoding="DRIVER" term="nl_be"/>
-                        <SYNONYM encoding="DRIVER" term="nld"/>
-                        <SYNONYM encoding="DRIVER" term="dutdut"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="eng" english_name="angielski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="en"/>
-                        <SYNONYM encoding="DRIVER" term="english"/>
-                        <SYNONYM encoding="DRIVER" term="en_us"/>
-                        <SYNONYM encoding="DRIVER" term="en_en"/>
-                        <SYNONYM encoding="DRIVER" term="en_au"/>
-                        <SYNONYM encoding="DRIVER" term="en_nz"/>
-                        <SYNONYM encoding="DRIVER" term="en_gb"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="epo" english_name="esperanto" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="eo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="est" english_name="estoński" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="et"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="fin" english_name="fiński" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="fra/fre" english_name="francuski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fr"/>
-                        <SYNONYM encoding="DRIVER" term="fr_be"/>
-                        <SYNONYM encoding="DRIVER" term="fr_fr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="deu/ger" english_name="niemiecki" native_name="Deutsch">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="de"/>
-                        <SYNONYM encoding="iso639-1" term="german"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ell/gre" english_name="grecki" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="el"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="hun" english_name="węgierski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ice/isl" english_name="islandzki" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="is"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ita" english_name="włoski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="it"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="jpn" english_name="japoński" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ja"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lat" english_name="łacina" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="la"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mon" english_name="mongolski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mul" english_name="wiele języków" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nep" english_name="nepalski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ne"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="nor" english_name="norweski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="no"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="pol" english_name="polski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="por" english_name="portugalski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pt"/>
-                        <SYNONYM encoding="DRIVER" term="pt_pt"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ron/rum" english_name="rumuński" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ro"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="rus" english_name="rosyjski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ru"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="slk/slo" english_name="słowacki" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="slv" english_name="słoweński" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="esl/spa" english_name="hiszpański" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="es"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sve/swe" english_name="szwedzki" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sv"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="cym/wel" english_name="walijski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="cy"/>
-                    </SYNONYMS>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2007-04-27T16:45:24+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/NamesofLanguages.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/NamesofLanguages.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/vocabularies/NamesofLanguages.xml	(nonexistent)
@@ -1,1534 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value="4-9a9666d9-be72-4e3b-9929-9b32a793500d_Vm9jYWJ1bGFyeURTUmVzb3VyY2VzL1ZvY2FidWxhcnlEU1Jlc291cmNlVHlwZQ=="/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value=""/>
-        <DATE_OF_CREATION value="2008-04-03T20:37:24+02:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Names of Languages</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>ISO 639-2 list of languages. It defines mapping from iso639-1 and DRIVER derived values.</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM encoding="abk" english_name="Abkhazian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="ab" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Achinese" encoding="ace">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Acoli" encoding="ach" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Adangme" native_name="" encoding="ada">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Afar" encoding="aar" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="aa" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="afh" english_name="Afrihili">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="afr" english_name="Afrikaans">
-                    <SYNONYMS>
-                        <SYNONYM term="af" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="afa" native_name="" english_name="Afro-Asiatic">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Akan" encoding="aka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="akk" english_name="Akkadian">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Albanian" encoding="alb/sqi">
-                    <SYNONYMS>
-                        <SYNONYM term="sq" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Aleut" native_name="" encoding="ale">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="alg" native_name="" english_name="Algonquian languages">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tut" english_name="Altaic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Amharic" encoding="amh">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="am"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="apa" native_name="" english_name="Apache">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Arabic" encoding="ara" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="ar" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Aramaic" native_name="" encoding="arc">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="arp" english_name="Arapaho" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="arn" english_name="Araucanian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="arw" native_name="" english_name="Arawak">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="arm/hye" native_name="" english_name="Armenian">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hy"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Artificial" native_name="" encoding="art">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Assamese" native_name="" encoding="asm">
-                    <SYNONYMS>
-                        <SYNONYM term="as" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ath" english_name="Athapascan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Austronesian" encoding="map">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Avaric" native_name="" encoding="ava">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Avestan" native_name="" encoding="ave">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="awa" english_name="Awadhi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="aym" native_name="" english_name="Aymara">
-                    <SYNONYMS>
-                        <SYNONYM term="ay" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Azerbaijani" encoding="aze">
-                    <SYNONYMS>
-                        <SYNONYM term="az" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Aztec" encoding="nah">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ban" native_name="" english_name="Balinese">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Baltic" encoding="bat">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Baluchi" encoding="bal">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bam" english_name="Bambara" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="bai" english_name="Bamileke">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="bad" english_name="Banda">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Bantu" native_name="" encoding="bnt">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bas" english_name="Basa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Bashkir" native_name="" encoding="bak">
-                    <SYNONYMS>
-                        <SYNONYM term="ba" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Basque" encoding="baq/eus">
-                    <SYNONYMS>
-                        <SYNONYM term="eu" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Beja" encoding="bej" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bem" native_name="" english_name="Bemba">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Bengali" encoding="ben" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="bn" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Berber" native_name="" encoding="ber">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Bhojpuri" encoding="bho" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Bihari" native_name="" encoding="bih">
-                    <SYNONYMS>
-                        <SYNONYM term="bh" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Bikol" native_name="" encoding="bik">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Bini" native_name="" encoding="bin">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="bis" english_name="Bislama">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bra" native_name="" english_name="Braj">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bre" native_name="" english_name="Breton">
-                    <SYNONYMS>
-                        <SYNONYM term="br" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bug" native_name="" english_name="Buginese">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Bulgarian" encoding="bul" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="bg" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bua" english_name="Buriat" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Burmese" encoding="bur/mya" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="my" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="bel" english_name="Byelorussian">
-                    <SYNONYMS>
-                        <SYNONYM term="be" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="cad" english_name="Caddo">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Carib" encoding="car">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="cat" english_name="Catalan">
-                    <SYNONYMS>
-                        <SYNONYM term="ca" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="cau" english_name="Caucasian">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Cebuano" encoding="ceb" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cel" native_name="" english_name="Celtic">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Central American Indian" encoding="cai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chg" english_name="Chagatai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="cha" english_name="Chamorro">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="che" english_name="Chechen" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Cherokee" native_name="" encoding="chr">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Cheyenne" native_name="" encoding="chy">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chb" english_name="Chibcha" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chi/zho" native_name="" english_name="Chinese">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="zh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Chinook jargon" native_name="" encoding="chn">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Choctaw" native_name="" encoding="cho">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Church Slavic" encoding="chu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chv" native_name="" english_name="Chuvash">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="cop" english_name="Coptic">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Cornish" native_name="" encoding="cor">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Corsican" encoding="cos">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="co"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Cree" native_name="" encoding="cre">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="mus" english_name="Creek">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="crp" english_name="Creoles and Pidgins">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="English-based Creoles and Pidgins" native_name="" encoding="cpe">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="French-based Creoles and Pidgins" encoding="cpf">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cpp" english_name="Portuguese-based Creoles and Pidgins" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Cushitic" encoding="cus">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="" english_name="Croatian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ces/cze" english_name="Czech" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="cs" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Dakota" native_name="" encoding="dak">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dan" english_name="Danish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="da" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="del" english_name="Delaware" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="din" english_name="Dinka">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Divehi" native_name="" encoding="div">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Dogri" encoding="doi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dra" native_name="" english_name="Dravidian">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Duala" encoding="dua" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Dutch" encoding="dut/nla">
-                    <SYNONYMS>
-                        <SYNONYM term="nl" encoding="iso639-1"/>
-                        <SYNONYM encoding="DRIVER" term="nl_nl"/>
-                        <SYNONYM term="nl_be" encoding="DRIVER"/>
-                        <SYNONYM term="nld" encoding="DRIVER"/>
-                        <SYNONYM encoding="DRIVER" term="dutdut"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="dum" english_name="Middle Dutch">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Dyula" encoding="dyu">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dzo" native_name="" english_name="Dzongkha">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="dz"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Efik" encoding="efi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="egy" english_name="Ancient Egyptian">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="eka" english_name="Ekajuk">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="elx" english_name="Elamite">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="eng" english_name="English">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="en"/>
-                        <SYNONYM encoding="DRIVER" term="english"/>
-                        <SYNONYM encoding="DRIVER" term="en_us"/>
-                        <SYNONYM term="en_en" encoding="DRIVER"/>
-                        <SYNONYM term="en_au" encoding="DRIVER"/>
-                        <SYNONYM term="en_nz" encoding="DRIVER"/>
-                        <SYNONYM term="en_gb" encoding="DRIVER"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Middle English" encoding="enm">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="ang" english_name="Old English">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Eskimo" native_name="" encoding="esk">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Esperanto" encoding="epo">
-                    <SYNONYMS>
-                        <SYNONYM term="eo" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Estonian" encoding="est" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="et" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Ewe" encoding="ewe">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Ewondo" encoding="ewo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="fan" english_name="Fang">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Fanti" native_name="" encoding="fat">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Faroese" encoding="fao" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Fijian" encoding="fij">
-                    <SYNONYMS>
-                        <SYNONYM term="fj" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="fin" native_name="" english_name="Finnish">
-                    <SYNONYMS>
-                        <SYNONYM term="fi" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Finno-Ugrian" encoding="fiu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fon" native_name="" english_name="Fon">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="French" encoding="fra/fre">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fr"/>
-                        <SYNONYM term="fr_be" encoding="DRIVER"/>
-                        <SYNONYM encoding="DRIVER" term="fr_fr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Middle French" native_name="" encoding="frm">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Old French" encoding="fro">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Frisian" encoding="fry">
-                    <SYNONYMS>
-                        <SYNONYM term="fy" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Fulah" encoding="ful">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Ga" encoding="gaa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="gae/gdh" english_name="Gaelic">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="glg" english_name="Gallegan">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="gl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="lug" english_name="Ganda">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="gay" english_name="Gayo">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Geez" native_name="" encoding="gez">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Georgian" native_name="" encoding="geo/kat">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ka"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="Deutsch" english_name="German" encoding="deu/ger">
-                    <SYNONYMS>
-                        <SYNONYM term="de" encoding="iso639-1"/>
-                        <SYNONYM term="german" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Middle High German" encoding="gmh" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="goh" native_name="" english_name="Old High German">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Germanic" encoding="gem">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="gil" english_name="Gilbertese">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Gondi" encoding="gon">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="got" native_name="" english_name="Gothic">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Grebo" encoding="grb" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Ancient Greek" native_name="" encoding="grc">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ell/gre" native_name="" english_name="Greek">
-                    <SYNONYMS>
-                        <SYNONYM term="el" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Greenlandic" encoding="kal">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="kl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="grn" english_name="Guarani" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="gn" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="guj" english_name="Gujarati">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="gu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Haida" encoding="hai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="hau" native_name="" english_name="Hausa">
-                    <SYNONYMS>
-                        <SYNONYM term="ha" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Hawaiian" encoding="haw" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Hebrew" encoding="heb" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="he"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="her" english_name="Herero">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Hiligaynon" native_name="" encoding="hil">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Himachali" encoding="him" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Hindi" encoding="hin">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Hiri Motu" encoding="hmo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="hun" native_name="" english_name="Hungarian">
-                    <SYNONYMS>
-                        <SYNONYM term="hu" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="hup" english_name="Hupa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="iba" english_name="Iban" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ice/isl" native_name="" english_name="Icelandic">
-                    <SYNONYMS>
-                        <SYNONYM term="is" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="ibo" english_name="Igbo">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Ijo" native_name="" encoding="ijo">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ilo" native_name="" english_name="Iloko">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="inc" english_name="Indic">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Indo-European" native_name="" encoding="ine">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Indonesian" encoding="ind">
-                    <SYNONYMS>
-                        <SYNONYM term="id" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Interlingua" encoding="ina">
-                    <SYNONYMS>
-                        <SYNONYM term="ia" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Interlingue" encoding="ine" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="-" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="iku" english_name="Inuktitut" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="iu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Inupiak" native_name="" encoding="ipk">
-                    <SYNONYMS>
-                        <SYNONYM term="ik" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Iranian" encoding="ira" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Irish" encoding="gai/iri" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="ga" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Irish" encoding="gle" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="old Irish" encoding="sga">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Middle Irish" encoding="mga">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Iroquoian" native_name="" encoding="iro">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Italian" encoding="ita">
-                    <SYNONYMS>
-                        <SYNONYM term="it" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Japanese" encoding="jpn" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ja"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="jav/jaw" english_name="Javanese">
-                    <SYNONYMS>
-                        <SYNONYM term="jv/jw" encoding="iso639-1"/>
-                        <SYNONYM term="jv" encoding="iso639-1"/>
-                        <SYNONYM encoding="iso639-1" term="jw"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="jrb" english_name="Judeo-Arabic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Judeo-Persian" encoding="jpr" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Kabyle" encoding="kab">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Kachin" native_name="" encoding="kac">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kam" native_name="" english_name="Kamba">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Kannada" encoding="kan">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="kn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Kanuri" encoding="kau" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="kaa" english_name="Kara-Kalpak">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kar" native_name="" english_name="Karen">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="kas" english_name="Kashmiri">
-                    <SYNONYMS>
-                        <SYNONYM term="ks" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Kawi" native_name="" encoding="kaw">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Kazakh" native_name="" encoding="kaz">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="kk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Khasi" native_name="" encoding="kha">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="khm" native_name="" english_name="Khmer">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="km"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Khoisan" encoding="khi">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Khotanese" encoding="kho">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kik" english_name="Kikuyu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Kinyarwanda" native_name="" encoding="kin">
-                    <SYNONYMS>
-                        <SYNONYM term="rw" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Kirghiz" encoding="kir">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ky"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="kom" english_name="Komi">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kon" native_name="" english_name="Kongo">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="kok" english_name="Konkani">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Korean" encoding="kor">
-                    <SYNONYMS>
-                        <SYNONYM term="ko" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Kpelle" encoding="kpe">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kro" english_name="Kru" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kua" native_name="" english_name="Kuanyama">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kum" native_name="" english_name="Kumyk">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kur" english_name="Kurdish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ku"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Kurukh" native_name="" encoding="kru">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kus" english_name="Kusaie" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="kut" english_name="Kutenai">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="lad" english_name="Ladino">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Lahnda" native_name="" encoding="lah">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Lamba" encoding="lam">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="oci" english_name="Langue d'Oc" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="oc" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lao" native_name="" english_name="Lao">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="lo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Latin" native_name="" encoding="lat">
-                    <SYNONYMS>
-                        <SYNONYM term="la" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="lav" english_name="Latvian">
-                    <SYNONYMS>
-                        <SYNONYM term="lv" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="ltz" english_name="Letzeburgesch">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="lez" english_name="Lezghian">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="lin" english_name="Lingala">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ln"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lit" native_name="" english_name="Lithuanian">
-                    <SYNONYMS>
-                        <SYNONYM term="lt" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="loz" english_name="Lozi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lub" native_name="" english_name="Luba-Katanga">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lui" english_name="Luiseno" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Lunda" encoding="lun" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="luo" native_name="" english_name="Luo">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Macedonian" encoding="mac/mak">
-                    <SYNONYMS>
-                        <SYNONYM term="mk" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Madurese" native_name="" encoding="mad">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Magahi" native_name="" encoding="mag">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Maithili" encoding="mai">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mak" native_name="" english_name="Makasar">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Malagasy" native_name="" encoding="mlg">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mg"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="may/msa" english_name="Malay" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ms"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mal" native_name="" english_name="Malayalam">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Maltese" native_name="" encoding="mlt">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ml"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="man" english_name="Mandingo">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mni" native_name="" english_name="Manipuri">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Manobo" encoding="mno" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="max" english_name="Manx" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Maori" encoding="mao/mri">
-                    <SYNONYMS>
-                        <SYNONYM term="mi" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="mar" english_name="Marathi">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Mari" encoding="chm" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mah" english_name="Marshall" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Marwari" encoding="mwr">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Masai" encoding="mas" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="myn" native_name="" english_name="Mayan">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="men" native_name="" english_name="Mende">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Micmac" encoding="mic">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="min" english_name="Minangkabau">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mis" native_name="" english_name="Miscellaneous">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="moh" english_name="Mohawk">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Moldavian" encoding="mol" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="mo" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Mon-Kmer" encoding="mkh">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lol" english_name="Mongo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mon" native_name="" english_name="Mongolian">
-                    <SYNONYMS>
-                        <SYNONYM term="mn" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="mos" english_name="Mossi">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mul" native_name="" english_name="Multiple languages">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Munda" encoding="mun">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Nauru" native_name="" encoding="nau">
-                    <SYNONYMS>
-                        <SYNONYM term="na" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="nav" native_name="" english_name="Navajo">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="nde" english_name="Ndebele">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="nbl" english_name="Ndebele">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Ndongo" encoding="ndo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Nepali" native_name="" encoding="nep">
-                    <SYNONYMS>
-                        <SYNONYM term="ne" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Newari" encoding="new">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Niger-Kordofanian" encoding="nic">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="ssa" english_name="Nilo-Saharan">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Niuean" encoding="niu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Norse" encoding="non">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nai" english_name="North American Indian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Norwegian" encoding="nor" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="no" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Ngomba" encoding="nno">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nub" english_name="Nubian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Nyamwezi" encoding="nym">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Nyanja" native_name="" encoding="nya">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Nyankole" encoding="nyn" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Nyoro" encoding="nyo">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nzi" native_name="" english_name="Nzima">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="oji" english_name="Ojibwa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Oriya" native_name="" encoding="ori">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="or"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="orm" english_name="Oromo" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="om" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="osa" english_name="Osage">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Ossetic" encoding="oss">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="oto" native_name="" english_name="Otomian">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Pahlavi" encoding="pal">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pau" native_name="" english_name="Palauan">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="pli" english_name="Pali">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Pampanga" native_name="" encoding="pam">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Pangasinan" encoding="pag">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Panjabi" encoding="pan">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="pap" english_name="Papiamento">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="paa" native_name="" english_name="Papuan-Australian">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fas/per" native_name="" english_name="Persian">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Persian, Old (ca 600 - 400 B.C.)" encoding="peo">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Phoenician" encoding="phn">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="pol" english_name="Polish">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="pon" native_name="" english_name="Ponape">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="por" english_name="Portuguese">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pt"/>
-                        <SYNONYM term="pt_pt" encoding="DRIVER"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Prakrit" encoding="pra">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Provencal" native_name="" encoding="pro">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pus" english_name="Pushto" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="ps" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Quechua" native_name="" encoding="que">
-                    <SYNONYMS>
-                        <SYNONYM term="qu" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Rhaeto-Romance" encoding="roh" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="rm"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Rajasthani" encoding="raj" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="rar" english_name="Rarotongan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Romance" encoding="roa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="ron/rum" english_name="Romanian">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ro"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Romany" native_name="" encoding="rom">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="run" english_name="Rundi">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="rn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="rus" english_name="Russian">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ru"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Salishan" native_name="" encoding="sal">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Samaritan" encoding="sam">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Sami" native_name="" encoding="smi">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Samoan" encoding="smo">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sm"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sad" native_name="" english_name="Sandawe">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="sag" english_name="Sango">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sg"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Sanskrit" native_name="" encoding="san">
-                    <SYNONYMS>
-                        <SYNONYM term="sa" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Sardinian" native_name="" encoding="srd">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Scots" encoding="sco">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Selkup" encoding="sel">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sem" english_name="Semitic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="" english_name="Serbian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="sr" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="scr" english_name="Serbo-Croatian">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="srr" english_name="Serbian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Shan" encoding="shn">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sna" english_name="Shona" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="sn" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sid" english_name="Sidamo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Siksika" encoding="bla" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Sindhi" encoding="snd">
-                    <SYNONYMS>
-                        <SYNONYM term="sd" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="sin" english_name="Singhalese">
-                    <SYNONYMS>
-                        <SYNONYM term="si" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Sino-Tibetan" native_name="" encoding="sit">
-                    <SYNONYMS>
-                        <SYNONYM term="-" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Siouan" native_name="" encoding="sio">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sla" native_name="" english_name="Slavic">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Siswant" encoding="ssw" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ss"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="slk/slo" english_name="Slovak">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="slv" english_name="Slovenian">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Sogdian" native_name="" encoding="sog">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Somali" native_name="" encoding="som">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="so"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Songhai" native_name="" encoding="son">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="wen" english_name="Sorbian">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nso" english_name="Sotho" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sot" english_name="Sotho" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="st"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sai" english_name="South American Indian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Spanish" encoding="esl/spa" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="es" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="suk" english_name="Sukuma">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Sumerian" encoding="sux">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Sudanese" encoding="sun" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="su"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sus" english_name="Susu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Swahili" native_name="" encoding="swa">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sw"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ssw" native_name="" english_name="Swazi">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Swedish" encoding="sve/swe">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sv"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="syr" english_name="Syriac">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tgl" english_name="Tagalog" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Tahitian" encoding="tah">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Tajik" native_name="" encoding="tgk">
-                    <SYNONYMS>
-                        <SYNONYM term="tg" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Tamashek" native_name="" encoding="tmh">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Tamil" native_name="" encoding="tam">
-                    <SYNONYMS>
-                        <SYNONYM term="ta" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="tat" english_name="Tatar">
-                    <SYNONYMS>
-                        <SYNONYM term="tt" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Telugu" encoding="tel" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="te"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ter" native_name="" english_name="Tereno">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="tha" english_name="Thai">
-                    <SYNONYMS>
-                        <SYNONYM term="th" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Tibetan" native_name="" encoding="bod/tib">
-                    <SYNONYMS>
-                        <SYNONYM term="bo" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Tigre" encoding="tig">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tir" native_name="" english_name="Tigrinya">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ti"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Timne" encoding="tem">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Tivi" native_name="" encoding="tiv">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Tlingit" native_name="" encoding="tli">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Tonga(Nyasa)" encoding="tog" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="to" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="ton" english_name="Tonga(Tonga Islands)">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tru" native_name="" english_name="Truk">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Tsimshian" native_name="" encoding="tsi">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Tsonga" encoding="tso" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="ts" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Tswana" encoding="tsn">
-                    <SYNONYMS>
-                        <SYNONYM term="tn" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tum" english_name="Tumbuka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Turkish" native_name="" encoding="tur">
-                    <SYNONYMS>
-                        <SYNONYM term="tr" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ota" english_name="Ottoman" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Turkmen" native_name="" encoding="tuk">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Tuvinian" native_name="" encoding="tyv">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Twi" native_name="" encoding="twi">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tw"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="uga" english_name="Ugaritic">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Uighur" encoding="uig">
-                    <SYNONYMS>
-                        <SYNONYM term="ug" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ukr" native_name="" english_name="Ukrainian">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="uk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="umb" native_name="" english_name="Umbundu">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Undetermined" encoding="und" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Urdu" native_name="" encoding="urd">
-                    <SYNONYMS>
-                        <SYNONYM term="ur" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="uzb" english_name="Uzbek">
-                    <SYNONYMS>
-                        <SYNONYM term="uz" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Vai" encoding="vai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ven" native_name="" english_name="Venda">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Vietnamese" encoding="vie">
-                    <SYNONYMS>
-                        <SYNONYM term="vi" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="VolapÃƒÂ¼k" native_name="" encoding="vol">
-                    <SYNONYMS>
-                        <SYNONYM term="vo" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Votic" encoding="vot" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Wakashan" encoding="wak">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="wal" english_name="Walamo">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="wln" english_name="Wallon">
-                    <SYNONYMS>
-                        <SYNONYM term="wa" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Waray" native_name="" encoding="war">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Washo" native_name="" encoding="was">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cym/wel" english_name="Welsh" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="cy" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Wolof" native_name="" encoding="wol">
-                    <SYNONYMS>
-                        <SYNONYM term="wo" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="xho" native_name="" english_name="Xhosa">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="xh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Yakut" encoding="sah" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Yao" encoding="yao">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Yap" encoding="yap">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="yid" english_name="Yiddish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="yi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Yoruba" encoding="yor" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="yo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Zapotec" encoding="zap" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="zen" native_name="" english_name="Zenaga">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="zha" native_name="" english_name="Zhuang">
-                    <SYNONYMS>
-                        <SYNONYM term="za" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Zulu" native_name="" encoding="zul">
-                    <SYNONYMS>
-                        <SYNONYM term="zu" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="zun" english_name="Zuni" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-04-03T20:37:24+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/app/plan/CollectionRewriteRuleTest.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/app/plan/CollectionRewriteRuleTest.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/app/plan/CollectionRewriteRuleTest.java	(nonexistent)
@@ -1,43 +0,0 @@
-package eu.dnetlib.data.search.app.plan;
-
-import eu.dnetlib.domain.functionality.Collection;
-import eu.dnetlib.utils.cql.CqlException;
-import gr.uoa.di.driver.enabling.ISLookUp;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class CollectionRewriteRuleTest {
-
-	final String field = "colid";
-	final String value = "foo-col";
-	final String retrieval = "f = v";
-	CollectionRewriteRule rule = null;
-
-	@SuppressWarnings("unchecked")
-	@Before
-	public void setUp() throws Exception {
-		rule = new CollectionRewriteRule(null, field);
-		ISLookUp<Collection> lookup = mock(ISLookUp.class);
-		Collection collection = mock(Collection.class);
-		rule.setCollectionLookUp(lookup);
-		when(collection.getRetrievalCondition()).thenReturn(retrieval);
-		when(lookup.getById(value)).thenReturn(collection);
-	}
-
-	@After
-	public void tearDown() throws Exception {
-		rule = null;
-	}
-	
-	@Test
-	public void testApply() throws CqlException {
-	/*	CqlClause clause = rule.apply(new CqlRelation(field, "=", "\"" + value +  "\""));
-		assertEquals(Cql.parse(retrieval).getRoot().toCqlString(),
-				clause.toCqlString());*/
-	}
-}
-
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/app/plan/PrefixRuleTest.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/app/plan/PrefixRuleTest.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/app/plan/PrefixRuleTest.java	(nonexistent)
@@ -1,41 +0,0 @@
-package eu.dnetlib.data.search.app.plan;
-
-import eu.dnetlib.utils.cql.CqlException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class PrefixRuleTest {
-
-	//Query query = null;
-	final String text = "foo and bar"; 
-	
-	@Before
-	public void setUp() throws Exception {
-		//query = new Query(text);
-	}
-
-	@After
-	public void tearDown() throws Exception {
-		//query = null;
-	}
-
-	@Test
-	public void testPrefixRule() throws CqlException {
-		PrefixRule rule = new PrefixRule(null, "baz");
-	//	query = rule.apply(query);
-	//	assertEquals("baz AND (" + text + ")", query.getText());
-	}
-
-	@Test
-	public void testBadPrefix() {
-		/*PrefixRule rule = new PrefixRule(null, "a b");
-		try {
-			query = rule.apply(query);
-			fail();
-			
-		} catch (CqlException cqle) {
-			assertEquals(text, query.getText());
-		}*/
-	}
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/app/plan/QueryTest.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/app/plan/QueryTest.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/app/plan/QueryTest.java	(nonexistent)
@@ -1,31 +0,0 @@
-package eu.dnetlib.data.search.app.plan;
-
-import eu.dnetlib.utils.cql.CqlException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class QueryTest {
-
-	@Before
-	public void setUp() throws Exception {
-	}
-
-	@After
-	public void tearDown() throws Exception {
-	}
-
-	@Test
-	public void testQuery() throws CqlException {
-		String text = "foo and bar";
-		Query query = new Query(text);
-		assertEquals(text, query.getText());
-		
-		//CqlQuery cql = query.getCqlQuery();
-		//assertNotNull(cql);
-		//assertEquals(cql.toString(), Cql.parse(text).toString());
-	}
-
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/app/plan/web/api/APIResponseFormatterTest.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/app/plan/web/api/APIResponseFormatterTest.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/app/plan/web/api/APIResponseFormatterTest.java	(nonexistent)
@@ -1,60 +0,0 @@
-package eu.dnetlib.data.search.app.plan.web.api;
-
-import eu.dnetlib.data.search.web.api.APIResponseFormatter;
-import junit.framework.Assert;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.log4j.BasicConfigurator;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.MediaType;
-import java.util.Arrays;
-
-import static org.mockito.Mockito.when;
-
-
-/**
- * Created by kiatrop on 22/11/2016.
- */
-public class APIResponseFormatterTest {
-    HttpServletRequest requestMock;
-
-    @Before
-    public  void before() {
-        BasicConfigurator.configure();
-        requestMock = Mockito.mock(HttpServletRequest.class);
-        when(requestMock.getRequestURL()).thenReturn(new StringBuffer().append("http://demo.url/search"));
-    }
-
-    @Test
-    public void createMetaTest() {
-        //Meta only with query
-        Assert.assertEquals("{\"status\": \"success\", \"code\":\"200\", \"query\":\"oaftype=result\", \"filters\":[], \"total\":\"0\", \"page\":\"0\", \"size\":\"0\", \"_links\": {\"self\": {\"href\":\"http://demo.url/search?page=0&size=0\"}}}",
-                APIResponseFormatter.createMeta(requestMock, MediaType.APPLICATION_JSON, "oaftype=result", null, 0, 0, 0));
-
-        Assert.assertEquals("<status>success</status><code>200</code><query>oaftype=result</query><filters></filters><total>0</total><page>0</page><size>0</size><links><self>"
-                + StringEscapeUtils.escapeXml("http://demo.url/search?page=0&size=0") + "</self></links>",
-                APIResponseFormatter.createMeta(requestMock, MediaType.APPLICATION_XML, "oaftype=result", null, 0, 0, 0));
-
-        //Meta only with query and filters
-        Assert.assertEquals("{\"status\": \"success\", \"code\":\"200\", \"query\":\"oaftype=result\", \"filters\":[\"(resultfunderid:ec____::EC)\",\"(resultfundinglevel1:1) (resultfundinglevel1:2)\"], \"total\":\"0\", \"page\":\"0\", \"size\":\"0\", \"_links\": {\"self\": {\"href\":\"http://demo.url/search?page=0&size=0\"}}}",
-                APIResponseFormatter.createMeta(requestMock, MediaType.APPLICATION_JSON, "oaftype=result", Arrays.asList(new String[]{"(resultfunderid:ec____::EC)", "(resultfundinglevel1:1) (resultfundinglevel1:2)"}), 0, 0, 0));
-
-        Assert.assertEquals("<status>success</status><code>200</code><query>oaftype=result</query><filters><filter>(resultfunderid:ec____::EC)</filter><filter>(resultfundinglevel1:1) (resultfundinglevel1:2)</filter></filters><total>0</total><page>0</page><size>0</size><links><self>" + StringEscapeUtils.escapeXml("http://demo.url/search?page=0&size=0") + "</self></links>",
-                APIResponseFormatter.createMeta(requestMock, MediaType.APPLICATION_XML, "oaftype=result", Arrays.asList(new String[]{"(resultfunderid:ec____::EC)", "(resultfundinglevel1:1) (resultfundinglevel1:2)"}), 0, 0, 0));
-
-        //Meta with query and paging
-        Assert.assertEquals("{\"status\": \"success\", \"code\":\"200\", \"query\":\"oaftype=result\", \"filters\":[\"(resultfunderid:ec____::EC)\",\"(resultfundinglevel1:1) (resultfundinglevel1:2)\"], \"total\":\"10\", \"page\":\"1\", \"size\":\"5\", \"_links\": {\"first\": {\"href\":\"http://demo.url/search?page=0&size=5\"},  \"last\": {\"href\":\"http://demo.url/search?page=1&size=5\"},  \"previous\": {\"href\":\"http://demo.url/search?page=0&size=5\"},   \"next\": {\"href\":\"http://demo.url/search?page=1&size=5\"},   \"self\": {\"href\":\"http://demo.url/search?page=1&size=5\"}}}",
-                APIResponseFormatter.createMeta(requestMock, MediaType.APPLICATION_JSON, "oaftype=result", Arrays.asList(new String[]{"(resultfunderid:ec____::EC)", "(resultfundinglevel1:1) (resultfundinglevel1:2)"}), 10, 1, 5));
-
-        Assert.assertEquals("<status>success</status><code>200</code><query>oaftype=result</query><filters><filter>(resultfunderid:ec____::EC)</filter><filter>(resultfundinglevel1:1) (resultfundinglevel1:2)</filter></filters><total>10</total><page>1</page><size>5</size>" +
-                "<links><first>" + StringEscapeUtils.escapeXml("http://demo.url/search?page=0&size=5") + "</first><last>" + StringEscapeUtils.escapeXml("http://demo.url/search?page=1&size=5") + "</last><previous>" +
-                StringEscapeUtils.escapeXml("http://demo.url/search?page=0&size=5") +"</previous><next>" + StringEscapeUtils.escapeXml("http://demo.url/search?page=1&size=5") +
-                "</next><self>" + StringEscapeUtils.escapeXml("http://demo.url/search?page=1&size=5") +"</self></links>",
-                APIResponseFormatter.createMeta(requestMock, MediaType.APPLICATION_XML, "oaftype=result", Arrays.asList(new String[]{"(resultfunderid:ec____::EC)", "(resultfundinglevel1:1) (resultfundinglevel1:2)"}), 10, 1, 5));
-
-    }
-
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/utils/cql/QueryEnhancerTest.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/utils/cql/QueryEnhancerTest.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/utils/cql/QueryEnhancerTest.java	(nonexistent)
@@ -1,165 +0,0 @@
-package eu.dnetlib.data.search.utils.cql;
-
-import org.apache.log4j.BasicConfigurator;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Created by kiatrop on 30/11/2016.
- */
-public class QueryEnhancerTest {
-    String indexfieldName = "indexfieldName";
-    String fieldvalue = "fieldvalue";
-
-    @Before
-    public  void before() {
-        BasicConfigurator.configure();
-    }
-
-    @Test
-    public void testExact(){
-        StringBuilder queryBuilder1 = new StringBuilder();
-        StringBuilder queryBuilder = new StringBuilder();
-
-        ParameterQueryEnhancer.addExactQueryTerm(indexfieldName, fieldvalue, queryBuilder1);
-        CQLQueryBuilder.appendFieldQuotedTerm(queryBuilder, CQLQueryBuilder.Operator.AND, indexfieldName, CQLQueryBuilder.Operator.EXACT, fieldvalue);
-
-        Assert.assertEquals(queryBuilder1.toString(), queryBuilder.toString());
-    }
-
-    @Test
-    public void testEqual(){
-        StringBuilder queryBuilder1 = new StringBuilder();
-        StringBuilder queryBuilder2 = new StringBuilder();
-
-        ParameterQueryEnhancer.addEqualQueryTerm(indexfieldName, fieldvalue, queryBuilder1);
-        CQLQueryBuilder.appendFieldQuotedTerm(queryBuilder2, CQLQueryBuilder.Operator.AND, indexfieldName, CQLQueryBuilder.Operator.EQUAL, fieldvalue);
-
-        Assert.assertEquals(queryBuilder1.toString(), queryBuilder2.toString());
-    }
-
-    @Test
-    public void testNotEqual(){
-        StringBuilder queryBuilder1 = new StringBuilder();
-        StringBuilder queryBuilder2 = new StringBuilder();
-
-        ParameterQueryEnhancer.addNotEqualQueryTerm(indexfieldName, fieldvalue, queryBuilder1);
-        CQLQueryBuilder.appendFieldQuotedTerm(queryBuilder2, CQLQueryBuilder.Operator.NOT, indexfieldName, CQLQueryBuilder.Operator.EQUAL, fieldvalue);
-
-        Assert.assertEquals(queryBuilder1.toString(), queryBuilder2.toString());
-    }
-
-    @Test
-    public void testDifferentEqual(){
-        StringBuilder queryBuilder1 = new StringBuilder();
-        StringBuilder queryBuilder2 = new StringBuilder();
-
-        ParameterQueryEnhancer.addDifferentQueryTerm(indexfieldName, fieldvalue, queryBuilder1);
-        CQLQueryBuilder.appendFieldQuotedTerm(queryBuilder2, CQLQueryBuilder.Operator.AND, indexfieldName, CQLQueryBuilder.Operator.NOTEQUAL, fieldvalue);
-
-        Assert.assertEquals(queryBuilder1.toString(), queryBuilder2.toString());
-    }
-
-    @Test
-    public void testKeywords() {
-        StringBuilder queryBuilder1 = new StringBuilder();
-        StringBuilder queryBuilder2 = new StringBuilder();
-
-        CQLQueryBuilder.appendKeywords(queryBuilder1, "keywords");
-        CQLQueryBuilder.appendSimpleTerm(queryBuilder2, CQLQueryBuilder.Operator.AND, "keywords");
-
-        Assert.assertEquals(queryBuilder1.toString(), queryBuilder2.toString());
-    }
-
-    @Test
-    public void appendKeywordsTest() {
-        StringBuilder queryBuilder1 = new StringBuilder();
-        StringBuilder queryBuilder2 = new StringBuilder();
-
-        //keyword1 and (__all exact "quoted term")
-        CQLQueryBuilder.appendKeywords(queryBuilder1, "keyword1 \"quoted term\"");
-        CQLQueryBuilder.appendSimpleTerm(queryBuilder2, CQLQueryBuilder.Operator.NONE, "keyword1");
-        CQLQueryBuilder.appendSimpleQuotedTerm(queryBuilder2, CQLQueryBuilder.Operator.AND, "\"quoted term\"");
-        Assert.assertEquals(queryBuilder2.toString(), queryBuilder1.toString());
-
-        //keyword1 and wrong and quoted and term
-        queryBuilder1 = new StringBuilder();
-        queryBuilder2 = new StringBuilder();
-        CQLQueryBuilder.appendKeywords(queryBuilder1, "keyword1 \"wrong quoted term");
-        CQLQueryBuilder.appendSimpleTerm(queryBuilder2, CQLQueryBuilder.Operator.NONE, "keyword1");
-        CQLQueryBuilder.appendSimpleTerm(queryBuilder2, CQLQueryBuilder.Operator.AND, "wrong");
-        CQLQueryBuilder.appendSimpleTerm(queryBuilder2, CQLQueryBuilder.Operator.AND, "quoted");
-        CQLQueryBuilder.appendSimpleTerm(queryBuilder2, CQLQueryBuilder.Operator.AND, "term");
-        Assert.assertEquals(queryBuilder2.toString(), queryBuilder1.toString());
-
-        //keyword1 and wrong and quoted and term
-        queryBuilder1 = new StringBuilder();
-        queryBuilder2 = new StringBuilder();
-        CQLQueryBuilder.appendKeywords(queryBuilder1, "keyword1 wrong quoted term\"");
-        CQLQueryBuilder.appendSimpleTerm(queryBuilder2, CQLQueryBuilder.Operator.NONE, "keyword1");
-        CQLQueryBuilder.appendSimpleTerm(queryBuilder2, CQLQueryBuilder.Operator.AND, "wrong");
-        CQLQueryBuilder.appendSimpleTerm(queryBuilder2, CQLQueryBuilder.Operator.AND, "quoted");
-        CQLQueryBuilder.appendSimpleTerm(queryBuilder2, CQLQueryBuilder.Operator.AND, "term");
-        Assert.assertEquals(queryBuilder2.toString(), queryBuilder1.toString());
-
-        //(__all exact "quoted term")
-        queryBuilder1 = new StringBuilder();
-        queryBuilder2 = new StringBuilder();
-        CQLQueryBuilder.appendKeywords(queryBuilder1, "\"quoted term\"");
-        CQLQueryBuilder.appendSimpleQuotedTerm(queryBuilder2, CQLQueryBuilder.Operator.NONE, "\"quoted term\"");
-        Assert.assertEquals(queryBuilder2.toString(), queryBuilder1.toString());
-
-        //
-        queryBuilder1 = new StringBuilder();
-        queryBuilder2 = new StringBuilder();
-        CQLQueryBuilder.appendKeywords(queryBuilder1, "");
-        Assert.assertEquals(queryBuilder2.toString(), queryBuilder1.toString());
-
-        //
-        queryBuilder1 = new StringBuilder();
-        queryBuilder2 = new StringBuilder();
-        CQLQueryBuilder.appendKeywords(queryBuilder1, null);
-        Assert.assertEquals(queryBuilder2.toString(), queryBuilder1.toString());
-
-
-        //existing_query and keyword1 and wrong and quoted and term
-        queryBuilder1 = new StringBuilder();
-        queryBuilder2 = new StringBuilder();
-        queryBuilder1.append("existing_query");
-        queryBuilder2.append("existing_query");
-        CQLQueryBuilder.appendKeywords(queryBuilder1, "keyword1 \"wrong quoted term");
-        CQLQueryBuilder.appendSimpleTerm(queryBuilder2, CQLQueryBuilder.Operator.AND, "keyword1");
-        CQLQueryBuilder.appendSimpleTerm(queryBuilder2, CQLQueryBuilder.Operator.AND, "wrong");
-        CQLQueryBuilder.appendSimpleTerm(queryBuilder2, CQLQueryBuilder.Operator.AND, "quoted");
-        CQLQueryBuilder.appendSimpleTerm(queryBuilder2, CQLQueryBuilder.Operator.AND, "term");
-        Assert.assertEquals(queryBuilder2.toString(), queryBuilder1.toString());
-
-        queryBuilder2 = new StringBuilder();
-
-        //existing_query and keyword1 and (__all exact "quoted term")
-        queryBuilder1 = new StringBuilder();
-        queryBuilder1.append("existing_query");
-        CQLQueryBuilder.appendKeywords(queryBuilder1, "keyword1 \"quoted term\"");
-        Assert.assertEquals(queryBuilder1.toString(), "existing_query and (keyword1) and (__all exact \"quoted term\")" );
-
-        //existing_query and (__all exact "quoted term")
-        queryBuilder1 = new StringBuilder();
-        queryBuilder1.append("existing_query");
-        CQLQueryBuilder.appendKeywords(queryBuilder1, "keyword1 \"quoted term\"");
-        Assert.assertEquals(queryBuilder1.toString(), "existing_query and (keyword1) and (__all exact \"quoted term\")");
-
-        //existing query
-        queryBuilder1 = new StringBuilder();
-        queryBuilder1.append("existing_query");
-        CQLQueryBuilder.appendKeywords(queryBuilder1, "");
-        Assert.assertEquals(queryBuilder1.toString(), "existing_query");
-
-        //existing query
-        queryBuilder1 = new StringBuilder();
-        queryBuilder1.append("existing_query");
-        CQLQueryBuilder.appendKeywords(queryBuilder1, null);
-        Assert.assertEquals(queryBuilder1.toString(), "existing_query");
-
-    }
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/utils/solr/SolrUtilsTest.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/utils/solr/SolrUtilsTest.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/utils/solr/SolrUtilsTest.java	(nonexistent)
@@ -1,229 +0,0 @@
-package eu.dnetlib.data.search.utils.solr;
-
-import eu.dnetlib.data.search.app.SearchServiceImpl;
-import eu.dnetlib.data.search.solr.SolrResultSet;
-import eu.dnetlib.data.search.web.api.SearchApiService;
-import eu.dnetlib.data.search.web.utils.RequestResponseHandler;
-import eu.dnetlib.functionality.cql.CqlTranslator;
-import eu.dnetlib.functionality.cql.CqlTranslatorImpl;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.solr.client.solrj.impl.CloudSolrClient;
-import org.apache.solr.common.util.NamedList;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.z3950.zing.cql.CQLParseException;
-
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doNothing;
-
-
-/**
- * Created by kiatrop on 9/11/2016.
- */
-public class SolrUtilsTest {
-
-    private org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(SearchApiService.class);
-
-    HttpServletRequest requestMock;
-    RequestResponseHandler.Entity entity;
-    List<String> refineFields = new ArrayList<String>();
-    List<String> fieldQueries = new ArrayList<String>();
-    List<String> fieldQueriesWithComma = new ArrayList<String>();
-    CloudSolrClient mockSolrClient;
-    SolrResultSet mockRS;
-
-    @Before
-    public  void before() {
-        BasicConfigurator.configure();
-        mockSolrClient = Mockito.mock(CloudSolrClient.class);
-        doNothing().when(mockSolrClient).setDefaultCollection(anyString());
-
-        mockRS = Mockito.mock(SolrResultSet.class);
-
-        refineFields = Arrays.asList(new String[]{"relfunderid", "relfundinglevel0_id", "relfundinglevel1_id", "relfundinglevel2_id"});
-
-        fieldQueries = Arrays.asList(new String[]{"(relfunderid exact ec___::EC) and (relfunderid exact wt___::WT)",
-                "relfundinglevel0_id exact ec___::EC::SP1" , "(relfundinglevel1_id exact ec___::EC::SP1::VALUE1) or (relfundinglevel1_id exact ec___::EC::SP1::VALUE2)"});
-
-        fieldQueriesWithComma = Arrays.asList(new String[]{"(relfunderid exact ec___::EC) and (relfunderid exact wt___::WT)",
-                "relfundinglevel0_id exact \"ec___::EC::SP1,ec___::EC::SP2\"" });
-
-    }
-
-
-    @Test
-    public void createEprQuery() {
-        String query = SearchServiceImpl.createEprQuery("(oaftype=result)", refineFields, fieldQueries);
-        Assert.assertEquals("query=(oaftype=result)" +
-                "&groupby=relfunderid,relfundinglevel0_id,relfundinglevel1_id,relfundinglevel2_id" +
-                "&fq=(relfunderid exact ec___::EC) and (relfunderid exact wt___::WT),relfundinglevel0_id exact ec___::EC::SP1," +
-                        "(relfundinglevel1_id exact ec___::EC::SP1::VALUE1) or (relfundinglevel1_id exact ec___::EC::SP1::VALUE2)", query);
-
-
-        //empty refine, empty fq
-        query = SearchServiceImpl.createEprQuery("(oaftype=result)", new ArrayList<String>(), new ArrayList<String>());
-        Assert.assertEquals("query=(oaftype=result)" +
-                "&groupby=" +
-                "&fq=", query);
-
-        //empty fq
-        query = SearchServiceImpl.createEprQuery("(oaftype=result)", refineFields, new ArrayList<String>());
-        Assert.assertEquals("query=(oaftype=result)" +
-                "&groupby=relfunderid,relfundinglevel0_id,relfundinglevel1_id,relfundinglevel2_id" +
-                "&fq=", query);
-
-        //empty refine
-        query = SearchServiceImpl.createEprQuery("(oaftype=result)", new ArrayList<String>(), fieldQueries);
-        Assert.assertEquals("query=(oaftype=result)" +
-                "&groupby=" +
-                "&fq=(relfunderid exact ec___::EC) and (relfunderid exact wt___::WT),relfundinglevel0_id exact ec___::EC::SP1," +
-                "(relfundinglevel1_id exact ec___::EC::SP1::VALUE1) or (relfundinglevel1_id exact ec___::EC::SP1::VALUE2)", query);
-
-        //empty query
-        query = SearchServiceImpl.createEprQuery("", new ArrayList<String>(), new ArrayList<String>());
-        Assert.assertEquals("query=" +
-                "&groupby=" +
-                "&fq=", query);
-
-        //null values
-        query = SearchServiceImpl.createEprQuery(null, null, null);
-        Assert.assertEquals("query=" +
-                "&groupby=" +
-                "&fq=", query);
-
-    }
-
-    @Test
-    public void extractQueryOptions() throws IOException, CQLParseException {
-        CqlTranslator cqlTranslator = new CqlTranslatorImpl();
-
-        NamedList<String> actual = SolrResultSetOptionsUtil.extractQueryOptions(SearchServiceImpl.createEprQuery("(oaftype=result)", refineFields, fieldQueries));
-        Assert.assertEquals(cqlTranslator.toLucene("(oaftype=result)"), actual.get("q"));
-        Assert.assertEquals("__result", actual.get("fl"));
-        Assert.assertEquals("true", actual.get("shards.tolerant"));
-        Assert.assertEquals("true", actual.get("facet"));
-        Assert.assertEquals("1", actual.get("facet.mincount"));
-        Assert.assertEquals(refineFields.size() + "", actual.get("facet.threads"));
-        Assert.assertEquals(refineFields.size(), actual.getAll("facet.field").size());
-        Assert.assertTrue(actual.getAll("facet.field").contains("relfunderid"));
-        Assert.assertTrue(actual.getAll("facet.field").contains("relfundinglevel1_id"));
-        Assert.assertTrue(actual.getAll("facet.field").contains("relfundinglevel2_id"));
-        Assert.assertFalse(actual.getAll("facet.field").contains("relfundinglevel3_id"));
-        Assert.assertEquals(fieldQueries.size(), actual.getAll("fq").size());
-        Assert.assertTrue(actual.getAll("fq").contains(cqlTranslator.toLucene("(relfunderid exact ec___::EC) and (relfunderid exact wt___::WT)")));
-        Assert.assertTrue(actual.getAll("fq").contains(cqlTranslator.toLucene("relfundinglevel0_id exact ec___::EC::SP1")));
-        Assert.assertTrue(actual.getAll("fq").contains(cqlTranslator.toLucene("(relfundinglevel1_id exact ec___::EC::SP1::VALUE1) or (relfundinglevel1_id exact ec___::EC::SP1::VALUE2)")));
-
-        actual = SolrResultSetOptionsUtil.extractQueryOptions(SearchServiceImpl.createEprQuery("(oaftype=result)", refineFields, fieldQueriesWithComma));
-        Assert.assertTrue(actual.getAll("fq").contains(cqlTranslator.toLucene("(relfunderid exact ec___::EC) and (relfunderid exact wt___::WT)")));
-        Assert.assertTrue(actual.getAll("fq").contains(cqlTranslator.toLucene("relfundinglevel0_id exact \"ec___::EC::SP1,ec___::EC::SP2\"")));
-
-        //empty refine, empty fq
-        actual = SolrResultSetOptionsUtil.extractQueryOptions(SearchServiceImpl.createEprQuery("(oaftype=result)", new ArrayList<String>(), new ArrayList<String>()));
-        Assert.assertEquals(cqlTranslator.toLucene("(oaftype=result)"), actual.get("q"));
-        Assert.assertEquals("__result", actual.get("fl"));
-        Assert.assertNull(actual.get("q.op"));
-        Assert.assertEquals("true", actual.get("shards.tolerant"));
-        Assert.assertNull(actual.get("facet"));
-        Assert.assertNull(actual.get("facet.mincount"));
-        Assert.assertNull(actual.get("facet.threads"));
-        Assert.assertNull(actual.get("facet.field"));
-        Assert.assertTrue(actual.getAll("facet.field").isEmpty());
-        Assert.assertNull(actual.get("fq"));
-        Assert.assertTrue(actual.getAll("fq").isEmpty());
-
-        //empty fq
-        actual = SolrResultSetOptionsUtil.extractQueryOptions(SearchServiceImpl.createEprQuery("(oaftype=result)", refineFields, new ArrayList<String>()));
-        Assert.assertEquals(cqlTranslator.toLucene("(oaftype=result)"), actual.get("q"));
-        Assert.assertEquals("__result", actual.get("fl"));
-        Assert.assertNull(actual.get("q.op"));
-        Assert.assertEquals("true", actual.get("shards.tolerant"));
-        Assert.assertEquals("true", actual.get("facet"));
-        Assert.assertEquals("1", actual.get("facet.mincount"));
-        Assert.assertEquals(refineFields.size() + "", actual.get("facet.threads"));
-        Assert.assertEquals(refineFields.size(), actual.getAll("facet.field").size());
-        Assert.assertTrue(actual.getAll("facet.field").contains("relfunderid"));
-        Assert.assertTrue(actual.getAll("facet.field").contains("relfundinglevel1_id"));
-        Assert.assertTrue(actual.getAll("facet.field").contains("relfundinglevel2_id"));
-        Assert.assertFalse(actual.getAll("facet.field").contains("relfundinglevel3_id"));
-        Assert.assertNull(actual.get("fq"));
-        Assert.assertTrue(actual.getAll("fq").isEmpty());
-
-        //null fq
-        actual = SolrResultSetOptionsUtil.extractQueryOptions(SearchServiceImpl.createEprQuery("(oaftype=result)", refineFields, null));
-        Assert.assertEquals(cqlTranslator.toLucene("(oaftype=result)"), actual.get("q"));
-        Assert.assertEquals("__result", actual.get("fl"));
-        Assert.assertNull(actual.get("q.op"));
-        Assert.assertEquals("true", actual.get("shards.tolerant"));
-        Assert.assertEquals("true", actual.get("facet"));
-        Assert.assertEquals("1", actual.get("facet.mincount"));
-        Assert.assertEquals(refineFields.size() + "", actual.get("facet.threads"));
-        Assert.assertEquals(refineFields.size(), actual.getAll("facet.field").size());
-        Assert.assertTrue(actual.getAll("facet.field").contains("relfunderid"));
-        Assert.assertTrue(actual.getAll("facet.field").contains("relfundinglevel1_id"));
-        Assert.assertTrue(actual.getAll("facet.field").contains("relfundinglevel2_id"));
-        Assert.assertFalse(actual.getAll("facet.field").contains("relfundinglevel3_id"));
-        Assert.assertNull(actual.get("fq"));
-        Assert.assertTrue(actual.getAll("fq").isEmpty());
-
-        //empty refine
-        actual = SolrResultSetOptionsUtil.extractQueryOptions(SearchServiceImpl.createEprQuery("(oaftype=result)", new ArrayList<String>(), fieldQueries));
-        Assert.assertEquals(cqlTranslator.toLucene("(oaftype=result)"), actual.get("q"));
-        Assert.assertEquals("__result", actual.get("fl"));
-//        Assert.assertEquals("AND", actual.get("q.op"));
-        Assert.assertEquals("true", actual.get("shards.tolerant"));
-        Assert.assertNull(actual.get("facet"));
-        Assert.assertNull(actual.get("facet.mincount"));
-        Assert.assertNull(actual.get("facet.threads"));
-        Assert.assertNull(actual.get("facet.field"));
-        Assert.assertTrue(actual.getAll("facet.field").isEmpty());
-        Assert.assertEquals(fieldQueries.size(), actual.getAll("fq").size());
-        Assert.assertTrue(actual.getAll("fq").contains(cqlTranslator.toLucene("(relfunderid exact ec___::EC) and (relfunderid exact wt___::WT)")));
-        Assert.assertTrue(actual.getAll("fq").contains(cqlTranslator.toLucene("relfundinglevel0_id exact ec___::EC::SP1")));
-        Assert.assertTrue(actual.getAll("fq").contains(cqlTranslator.toLucene("(relfundinglevel1_id exact ec___::EC::SP1::VALUE1) or (relfundinglevel1_id exact ec___::EC::SP1::VALUE2)")));
-
-        //null refine
-        actual = SolrResultSetOptionsUtil.extractQueryOptions(SearchServiceImpl.createEprQuery("(oaftype=result)", null, fieldQueries));
-        Assert.assertEquals(cqlTranslator.toLucene("(oaftype=result)"), actual.get("q"));
-        Assert.assertEquals("__result", actual.get("fl"));
-  //      Assert.assertEquals("AND", actual.get("q.op"));
-        Assert.assertEquals("true", actual.get("shards.tolerant"));
-        Assert.assertNull(actual.get("facet"));
-        Assert.assertNull(actual.get("facet.mincount"));
-        Assert.assertNull(actual.get("facet.threads"));
-        Assert.assertNull(actual.get("facet.field"));
-        Assert.assertTrue(actual.getAll("facet.field").isEmpty());
-        Assert.assertEquals(fieldQueries.size(), actual.getAll("fq").size());
-        Assert.assertTrue(actual.getAll("fq").contains(cqlTranslator.toLucene(("(relfunderid exact ec___::EC) and (relfunderid exact wt___::WT)"))));
-        Assert.assertTrue(actual.getAll("fq").contains(cqlTranslator.toLucene("relfundinglevel0_id exact ec___::EC::SP1")));
-        Assert.assertTrue(actual.getAll("fq").contains(cqlTranslator.toLucene("(relfundinglevel1_id exact ec___::EC::SP1::VALUE1) or (relfundinglevel1_id exact ec___::EC::SP1::VALUE2)")));
-
-        //null refine, null fq
-        actual = SolrResultSetOptionsUtil.extractQueryOptions(SearchServiceImpl.createEprQuery("(oaftype=result)", null, null));
-        Assert.assertEquals(cqlTranslator.toLucene("(oaftype=result)"), actual.get("q"));
-        Assert.assertEquals("__result", actual.get("fl"));
-        Assert.assertNull(actual.get("q.op"));
-        Assert.assertEquals("true", actual.get("shards.tolerant"));
-        Assert.assertNull(actual.get("facet"));
-        Assert.assertNull(actual.get("facet.mincount"));
-        Assert.assertNull(actual.get("facet.threads"));
-        Assert.assertNull(actual.get("facet.field"));
-        Assert.assertTrue(actual.getAll("facet.field").isEmpty());
-        Assert.assertNull(actual.get("fq"));
-        Assert.assertTrue(actual.getAll("fq").isEmpty());
-    }
-
-    @Test(expected=CQLParseException.class)
-    public void extractQueryOptionsEmptyQuery() throws IOException, CQLParseException {
-        NamedList<String> actual  = SolrResultSetOptionsUtil.extractQueryOptions(SearchServiceImpl.createEprQuery(null, null, null));
-    }
-
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/SSTest.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/SSTest.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/SSTest.java	(nonexistent)
@@ -1,29 +0,0 @@
-package eu.dnetlib.data.search;
-
-/**
- * Created by kiatrop on 2/12/2016.
- */
-public class SSTest {
-
-/*    SearchServiceImpl ss = new SearchServiceImpl();
-    ServiceLocator<IndexService> mockIndexServiceServiceLocator = mock(ServiceLocator.class);
-    SolrIndexClient mockIndexService = mock(SolrIndexClient.class);
-
-    @Before
-    public void setup() {
-        BasicConfigurator.configure();
-
-        System.out.println(ss.getIndexLocator());
-        //when(ss.getIndexLocator()).thenReturn(mockIndexServiceServiceLocator);
-        when(mockIndexServiceServiceLocator.getService()).thenReturn(mockIndexService);
-        ss.setIndexLocator(mockIndexServiceServiceLocator);
-        //doNothing().when(((SearchServiceImpl) ss).getIndexLocator().getService());
-
-    }
-
-    @Test
-    public void test() throws SearchServiceException {
-        ss.search("oaftype=result", null, "", 1,1);
-    }
-*/
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/transform/TransformerFactoryTest.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/transform/TransformerFactoryTest.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/transform/TransformerFactoryTest.java	(nonexistent)
@@ -1,51 +0,0 @@
-package eu.dnetlib.data.search.transform;
-
-import eu.dnetlib.data.search.transform.config.ConfigurationFactory;
-import org.apache.log4j.BasicConfigurator;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import java.io.IOException;
-
-
-public class TransformerFactoryTest {
-
-	private static String registryAddress = "http://node1.t.openaire.research-infrastructures.eu:8280/is/services/isRegistry";
-	private static String lookupAdress = "http://node1.t.openaire.research-infrastructures.eu:8280/is/services/isLookUp";
-	
-	@BeforeClass
-	public static void setup() throws IOException {
-		BasicConfigurator.configure();
-		
-	}
-	@Test
-	public void TestTransformerFactory() throws Exception{
-		ConfigurationFactory factory = new ConfigurationFactory();
-		/*factory.setConfigurationName("/home/dimitra/projects/uoa-trunk/uoa-search/test/junit/eu/dnetlib/data/search/transform/configuration.xml");
-		factory.init();
-		factory.setVocabulariesPath("/home/dimitra/vocabularies/");
-		Configuration config = factory.createConfiguration("");
-		SearchRegistry sr = new SearchRegistry();
-		sr.setConfig(config);*/
-		
-		/*LocalVocabularyLoader lvl = new LocalVocabularyLoader();
-		
-		
-		IndexVocabularyLoader ivl = new IndexVocabularyLoader();
-		ivl.setSearchServiceLocator(new ServiceLocator<SearchService>());
-		
-		
-		VocabularyManagerImpl vocman = new VocabularyManagerImpl();
-		vocman.setConfig(config);
-		vocman.setIndexVocabularyLoader(new IndexVocabularyLoader());
-		
-		vocman.init();*/
-		
-		//ChainTransformer ct = (ChainTransformer)sr.getTransformer("results_openaire", config.getLocales().get(0));
-		//List<Transformer> all = ct.getTransformers();
-		
-		//XsltTransformer tr = (XsltTransformer)all.get(1);
-		//System.out.println(tr.getXslt());
-	
-	}
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/transform/XsltTransformerTest.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/transform/XsltTransformerTest.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/transform/XsltTransformerTest.java	(nonexistent)
@@ -1,45 +0,0 @@
-package eu.dnetlib.data.search.transform;
-
-import org.apache.log4j.BasicConfigurator;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.IOException;
-
-public class XsltTransformerTest {
-	@Before
-	public void setup() throws IOException {
-		BasicConfigurator.configure();
-	}
-	@Test
-	public void TestTransformer() throws Exception{
-		String xslt = "<xsl:stylesheet version=\"1.0\" xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"><xsl:output method=\"xml\" indent=\"yes\" encoding=\"UTF-8\"/><xsl:template match=\"/\"><xsl:apply-templates/></xsl:template>";
-		xslt += "<xsl:template match=\"@*|node()\"><xsl:copy><xsl:apply-templates select=\"@*|node()\"/></xsl:copy></xsl:template></xsl:stylesheet>";
-		
-		String input = "<record type=\"result\"><field name=\"resultId\" value=\"WOS:000285231000019\" label=\"resultId\" indexId=\"\"/>";
-		input += "<field name=\"title\" label=\"Title\" indexId=\"\" value=\"BLOCKADE OF CENTRAL NICOTINE ACETYLCHOLINE RECEPTOR \"/>";
-		input += "<field name=\"description\" label=\"Description\" indexId=\"\" value=\"Here we sought ...\"/>";
-		input += "</record>";
-		
-		String cur = "";
-		String prev = "";
-		
-		XsltTransformer TR = new XsltTransformer(xslt); 
-
-		long start = System.nanoTime();
-		
-		prev = TR.transform(input);
-		for(int i =2; i<10000;i++) {
-			cur = TR.transform(input);
-			if(!cur.equals(prev)) {
-				System.out.println("Error in "+i+" time");
-				System.out.println(prev);
-				System.out.println(cur);
-				break;
-			}
-			prev = cur;				
-		}
-		long end = System.nanoTime();
-		System.out.println(end-start);
-	}
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/transform/FormatterTest.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/transform/FormatterTest.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/transform/FormatterTest.java	(nonexistent)
@@ -1,42 +0,0 @@
-package eu.dnetlib.data.search.transform;
-
-import eu.dnetlib.data.search.transform.formatter.SimpleFormatter;
-import org.apache.log4j.BasicConfigurator;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Locale;
-
-public class FormatterTest {
-	@Before
-	public void setup() throws IOException {
-		BasicConfigurator.configure();
-	}
-	@Test
-	public void TestFormatter() throws Exception{
-		
-		String per1 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> <record xmlns:dri=\"http://www.driver-repository.eu/namespace/dri\" xmlns:oaf=\"http://namespace.openaire.eu/oaf\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" type=\"person\">    <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_E._Egecioglu\" label=\"personId\" indexId=\"dri:objIdentifier\"/>    <field name=\"fullname\" multiplicity=\"false\" value=\"E. Egecioglu\" label=\"Fullname\" indexId=\"\"/>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_K._P._Skibicka\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"K. P. Skibicka\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_E._Hrabovszky\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"E. Hrabovszky\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_Z._Liposits\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"Z. Liposits\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_J._A._Engel\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"J. A. Engel\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_E._Jerlhag\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"E. Jerlhag\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_C._S._Molnar\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"C. S. Molnar\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_S._L._Dickson\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"S. L. Dickson\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_M._Alvarez-Crespo\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"M. Alvarez-Crespo\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_C._Hansson\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"C. Hansson\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"result\">       <field name=\"resultId\" multiplicity=\"false\" value=\"WOS:000285231000019\" label=\"resultId\" indexId=\"\"/>       <field name=\"title\" multiplicity=\"true\" value=\"BLOCKADE OF CENTRAL NICOTINE ACETYLCHOLINE RECEPTOR SIGNALING ATTENUATE GHRELIN-INDUCED FOOD INTAKE IN RODENTS\" label=\"Title\" indexId=\"\"/>       <field name=\"publicationYear\" multiplicity=\"false\" value=\"2010\" label=\"Publication Year\" indexId=\"\"/>    </field> </record>";
-		
-		String per2 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> <record xmlns:dri=\"http://www.driver-repository.eu/namespace/dri\" xmlns:oaf=\"http://namespace.openaire.eu/oaf\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" type=\"person\">    <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_E._Egecioglu\" label=\"personId\" indexId=\"dri:objIdentifier\"/>    <field name=\"fullname\" multiplicity=\"false\" value=\"E. Egecioglu\" label=\"Fullname\" indexId=\"\"/>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_K._P._Skibicka\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"K. P. Skibicka\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_E._Hrabovszky\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"E. Hrabovszky\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_Z._Liposits\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"Z. Liposits\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_J._A._Engel\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"J. A. Engel\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_E._Jerlhag\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"E. Jerlhag\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_C._S._Molnar\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"C. S. Molnar\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_S._L._Dickson\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"S. L. Dickson\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_M._Alvarez-Crespo\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"M. Alvarez-Crespo\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_C._Hansson\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"C. Hansson\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"result\">       <field name=\"resultId\" multiplicity=\"false\" value=\"WOS:000285231000019\" label=\"resultId\" indexId=\"\"/>       <field name=\"title\" multiplicity=\"true\" value=\"BLOCKADE OF CENTRAL NICOTINE ACETYLCHOLINE RECEPTOR SIGNALING ATTENUATE GHRELIN-INDUCED FOOD INTAKE IN RODENTS\" label=\"Title\" indexId=\"\"/>       <field name=\"publicationYear\" multiplicity=\"false\" value=\"2010\" label=\"Publication Year\" indexId=\"\"/>    </field> </record>";
-		
-		String per3 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> <record xmlns:dri=\"http://www.driver-repository.eu/namespace/dri\" xmlns:oaf=\"http://namespace.openaire.eu/oaf\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" type=\"person\">    <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_E._Egecioglu\" label=\"personId\" indexId=\"dri:objIdentifier\"/>    <field name=\"fullname\" multiplicity=\"false\" value=\"E. Egecioglu\" label=\"Fullname\" indexId=\"\"/>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_K._P._Skibicka\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"K. P. Skibicka\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_E._Hrabovszky\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"E. Hrabovszky\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_Z._Liposits\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"Z. Liposits\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_J._A._Engel\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"J. A. Engel\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_E._Jerlhag\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"E. Jerlhag\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_C._S._Molnar\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"C. S. Molnar\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_S._L._Dickson\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"S. L. Dickson\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_M._Alvarez-Crespo\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"M. Alvarez-Crespo\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"coauthor\">       <field name=\"personId\" multiplicity=\"false\" value=\"WOS:000285231000019_C._Hansson\" label=\"personId\" indexId=\"\"/>       <field name=\"fullname\" multiplicity=\"false\" value=\"C. Hansson\" label=\"Fullname\" indexId=\"\"/>    </field>    <field multiplicity=\"true\" name=\"result\">       <field name=\"resultId\" multiplicity=\"false\" value=\"WOS:000285231000019\" label=\"resultId\" indexId=\"\"/>       <field name=\"title\" multiplicity=\"true\" value=\"BLOCKADE OF CENTRAL NICOTINE ACETYLCHOLINE RECEPTOR SIGNALING ATTENUATE GHRELIN-INDUCED FOOD INTAKE IN RODENTS\" label=\"Title\" indexId=\"\"/>       <field name=\"publicationYear\" multiplicity=\"false\" value=\"2010\" label=\"Publication Year\" indexId=\"\"/>    </field> </record>";
-		
-		String output = null;
-		Locale locale = new Locale("en");
-		
-		ArrayList<String> initResults = new ArrayList<String>();
-		ArrayList<String> cleanResults = new ArrayList<String>();
-		
-		initResults.add(per1);
-		initResults.add(per2);
-		initResults.add(per3);
-		
-		SimpleFormatter formatter = new SimpleFormatter(); 
-
-		cleanResults = (ArrayList<String>) formatter.clearDeclarations(initResults);
-		System.out.println(initResults.toString());
-		
-	}
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/transform/ConfigurationTest.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/transform/ConfigurationTest.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/transform/ConfigurationTest.java	(nonexistent)
@@ -1,40 +0,0 @@
-package eu.dnetlib.data.search.transform;
-
-import eu.dnetlib.data.search.transform.config.ConfigurationFactoryException;
-import org.junit.Before;
-import org.junit.Test;
-
-import javax.xml.xpath.XPathExpressionException;
-import java.io.IOException;
-
-
-
-public class ConfigurationTest {
-	
-	@Before
-	public void setup() throws IOException {
-		
-	}
-	
-	@Test
-	public void testParse() throws XPathExpressionException, IOException, ConfigurationFactoryException {
-//		ConfigurationFactory factory = new ConfigurationFactory();
-//		factory.setConfigurationName("configuration.xml");
-//		factory.createConfiguration("config");
-//		
-//		Configuration configuration = factory.createConfiguration("testConfig");
-//		assertEquals("testConfig", configuration.getConfigurationName());
-//		
-//		assertEquals(new Locale("en","US"), configuration.getDefaultLocale());
-//		
-//		assertEquals(3, configuration.getVocabulariesMap().keySet().size());
-//		assertNotNull(configuration.getVocabulariesMap().get("languages"));
-//		
-//		assertEquals(configuration.getLocales().size(), configuration.getVocabulariesMap().get("languages").keySet().size());
-//		
-//		for (Locale locale: configuration.getLocales()) {
-//			assertEquals("src/main/eu/dnetlib/data/search/transform/xmls/"+"languages"+"_"+locale+".xml", 
-//					configuration.getVocabulariesMap().get("languages").get(locale));
-//		}
-	}
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/transform/VocabularyTest.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/transform/VocabularyTest.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/test/java/eu/dnetlib/data/search/transform/VocabularyTest.java	(nonexistent)
@@ -1,142 +0,0 @@
-package eu.dnetlib.data.search.transform;
-
-import eu.dnetlib.api.data.SearchService;
-import eu.dnetlib.api.data.SearchServiceException;
-import gr.uoa.di.driver.enabling.vocabulary.ISVocabularyLoader;
-import gr.uoa.di.driver.util.StaticServiceLocator;
-import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import javax.xml.bind.JAXBException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-import java.io.IOException;
-
-public class VocabularyTest {
-
-	private static String registryAddress = "http://node1.t.openaire.research-infrastructures.eu:8280/is/services/isRegistry";
-	private static String lookupAddress = "http://node1.t.openaire.research-infrastructures.eu:8280/is/services/isLookUp";
-
-    private static String searchAddress = "http://services.openaire.eu:8380/search/services/searchWebService/search";
-
-	private ISVocabularyLoader loader;
-	
-	@Before
-	public void setup() throws JAXBException, SearchServiceException {
-		JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
-        factory.setServiceClass(SearchService.class);
-        factory.setAddress(searchAddress);
-        SearchService searchService  = (SearchService) factory.create();
-
-        StaticServiceLocator<SearchService> searchServiceStaticServiceLocator = new StaticServiceLocator<eu.dnetlib.api.data.SearchService>();
-        searchServiceStaticServiceLocator.setService(searchService);
-
-
-    //    searchServiceStaticServiceLocator.getService().search("1", "", "", 1, 1);
-
-    //    searchServiceStaticServiceLocator.getService().search("1", "", "", "", 1, 1);
-/*		factory.setServiceClass(ISRegistryService.class);
-		factory.setAddress(registryAddress);
-		ISRegistryService registryEndpoint = (ISRegistryService) factory
-				.create();
-
-		factory = new JaxWsProxyFactoryBean();
-		factory.setServiceClass(ISLookUpService.class);
-		factory.setAddress(lookupAddress);
-		ISLookUpService lookupEndpoint = (ISLookUpService) factory.create();
-
-		ISRegistryClient registryClient = new ISRegistryClient();
-		registryClient.setIsRegistry(registryEndpoint);
-
-		ISLookUpClient lookupClient = new ISLookUpClient();
-		lookupClient.setIsLookUp(lookupClient);
-		StaticServiceLocator<eu.dnetlib.api.enabling.ISLookUpService> lookupLocator = new StaticServiceLocator<eu.dnetlib.api.enabling.ISLookUpService>();
-		lookupLocator.setService(lookupClient);
-
-		ISLookUpImpl<Vocabulary> islookup = new ISLookUpImpl<Vocabulary>();*/
-//		islookup.setConverter(new VocabularyXmlConverter());
-//		islookup.setLookupLocator(lookupLocator);
-//		loader = new ISVocabularyLoader();
-//		loader.setLookUp(islookup);
-	}
-
-    @Test
-    public void testaki(){
-
-    }
-
-	public static String donothing(){
-		return registryAddress;
-	}
-	
-	@Ignore
-	@Test
-	public void test() throws IOException, TransformerFactoryConfigurationError, TransformerException {
-//		
-//		Vocabulary v = loader.getVocabulary("Names of languages", new Locale("en") ,Locale.ROOT);
-//		//System.out.println(v.getEnglishNames());
-//		HashMap hm = new HashMap<String, Vocabulary>();
-//		hm.put("languages", v);
-//		TestVocabRegistry vr = new TestVocabRegistry(hm);
-//		//Vocabulary vl = vr.getVocabulary("languages");
-//		//System.out.println(vl.getEnglishName("eng"));
-//		
-//		//System.out.println(vr.getValue("languages", "eng"));
-//		
-//		//VocabularyManager vocabularyManager = new VocabularyManagerImpl();
-//		
-//		//Katerina krina = new Katerina();
-//		//krina.setVocabularyManager(vocabularyManager);
-//		
-//		File xmlf = new File("/home/dimitra/saxon6-5-5/katerinatest/lang.xml");
-//		String xml= FileUtils.readFileToString(xmlf);
-//		System.out.println("read xml");
-//		//first xsl		
-//		File sxslf = new File("/home/dimitra/saxon6-5-5/katerinatest/browse.xsl");
-//		String sxsl = FileUtils.readFileToString(sxslf);
-//		javax.xml.transform.Transformer sTransformer = TransformerFactory.newInstance().newTransformer(new StreamSource(new StringReader(sxsl)));
-//		System.out.println("read sxsl");
-//		//second xsl
-//		File jxslf = new File("/home/dimitra/saxon6-5-5/katerinatest/fromvel.xsl");
-//		String jxsl = FileUtils.readFileToString(jxslf);
-//		javax.xml.transform.Transformer jTransformer = TransformerFactory.newInstance().newTransformer(new StreamSource(new StringReader(jxsl)));
-//		System.out.println("read jxsl");
-//		//are they working?
-//		StringWriter xmlResultResource = new StringWriter();
-//		//simple
-//		StreamResult sts = new StreamResult(xmlResultResource);
-//	    //xmlResultResource.getBuffer().setLength(0);		
-//	    //sTransformer.transform(new StreamSource(new StringReader(xml)), sts);
-//	    //System.out.println("transformed xml: "+xmlResultResource.getBuffer().toString());
-//	    //System.out.println("first transform: ok");
-//	    //java
-//	    StreamResult stj = new StreamResult(xmlResultResource);
-//	    //xmlResultResource.getBuffer().setLength(0);		
-//	    //jTransformer.transform(new StreamSource(new StringReader(xml)), stj);
-//	    //System.out.println("transformed xml: "+xmlResultResource.getBuffer().toString());
-//	    //System.out.println("second transform: ok");
-//	    
-//		
-//	    long startTime = System.currentTimeMillis();
-//	    //make 1000 translations with the first way and measure the time
-//		/*for(int i=0;i<1000;i++){
-//			xmlResultResource.getBuffer().setLength(0);		
-//		    sTransformer.transform(new StreamSource(new StringReader(xml)), sts);
-//		}*/	    
-//	    long stopTime = System.currentTimeMillis();
-//	    long elapsedTime = stopTime - startTime;
-//	    //System.out.println("simple way: "+elapsedTime);		
-//		//make 1000 translations with the second way and measure the time
-//	    startTime = System.currentTimeMillis();
-//	    for(int i=0;i<1000;i++){
-//			xmlResultResource.getBuffer().setLength(0);		
-//			jTransformer.transform(new StreamSource(new StringReader(xml)), stj);
-//	    }
-//	    stopTime = System.currentTimeMillis();
-//	    elapsedTime = stopTime - startTime;
-//	    System.out.println("java way: "+elapsedTime);
-//	    //Assert.assertEquals("eu.dnetlib.data.search.utils.vοcabulary.VocabularyManagerImpl", "eu.dnetlib.data.search.utils.vocabulary.VocabularyManagerImpl");
-	}
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/test/resources/eu/dnetlib/data/search/transform/bibtexConfig.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/test/resources/eu/dnetlib/data/search/transform/bibtexConfig.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/test/resources/eu/dnetlib/data/search/transform/bibtexConfig.xml	(nonexistent)
@@ -1,49 +0,0 @@
-<bibTexConfig name="type">
-	<case value="article" bibTexType="article">
-		<term bibtexname="author" indexname="dc:creator"/>
-		<term bibtexname="title" indexname="title"/>
-		<term bibtexname="journal" indexname="dc:source"/>
-		<term bibtexname="year" indexname="publicationyear"/>
-	</case>
-	<case value="book" bibTexType="book">
-		<term bibtexname="editor" indexname="dc:creator"/>
-		<term bibtexname="title" indexname="title"/>
-		<term bibtexname="publisher" indexname="publisher"/>
-		<term bibtexname="year" indexname="publicationyear"/>
-	</case>
-	<case value="bookPart" bibTexType="incollection">
-		<term bibtexname="author" indexname="dc:creator"/>
-		<term bibtexname="title indexname="title"/">
-		<term bibtexname="booktitle" indexname="source or dc:relation"/>
-		<term bibtexname="year" indexname="publicationyear"/>
-	</case>
-	<case value="conferenceObject" bibTexType="inproceedings">
-		<term bibtexname="author" indexname="dc:creator"/>
-		<term bibtexname="title" indexname="title"/>
-		<term bibtexname="booktitle" indexname="source or dc:relation"/>
-		<term bibtexname="year" indexname="publicationyear"/>
-	</case>
-	<case value="masterThesis" bibTexType="masterthesis">
-		<term bibtexname="author" indexname="dc:creator"/>
-		<term bibtexname="title" indexname="title"/>
-		<term bibtexname="school" indexname="affiliationname"/>
-		<term bibtexname="year" indexname="publicationyear"/>
-	</case>
-	<case value="doctoralThesis" bibTexType="phdthesis">
-		<term bibtexname="author" indexname="dc:creator"/>
-		<term bibtexname="title" indexname="title"/>
-		<term bibtexname="school" indexname="affiliationname"/>
-		<term bibtexname="year" indexname="publicationyear"/>
-	</case>
-	<case value="report" bibTexType="techreport">
-		<term bibtexname="author" indexname="dc:creator"/>
-		<term bibtexname="title" indexname="title"/>
-		<term bibtexname="institution" indexname="affiliationname"/>	
-	</case>
-	<defaultcase bibTexType="misc">
-		<term bibtexname="author" indexname="dc:creator"/>
-		<term bibtexname="title" indexname="title"/>
-		<term bibtexname="year" indexname="publicationyear"/>
-	</case>
-</bibTexConfig>
-
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/test/resources/eu/dnetlib/data/search/transform/configuration.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/test/resources/eu/dnetlib/data/search/transform/configuration.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/test/resources/eu/dnetlib/data/search/transform/configuration.xml	(nonexistent)
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<configuration>
-	<locales>
-		<locale name="en_US" default="true" />
-		<locale name="fr_FR" default="false" />
-		<locale name="gr_GR" default="false" />
-	</locales>
-
-	<vocabularies>
-	 	<is_vocabulary name="languages" xml_name="Names of Languages" />
-		<is_vocabulary name="countries" xml_name="Names of Countries" />
-		<is_vocabulary name="labels" xml_name="Short list of language names" />
-
-		<index_vocabulary name="datasources" query="oaftype=datasource" transformer="datasourceVocabularyTransformer"/>
-		<index_vocabulary name="projects" query="oaftype=project" transformer="projectVocabularyTransformer"/>
-
-		<local_vocabulary name="funders" file="funders.xml" />
-		<local_vocabulary name="programmes" file="programmes.xml" />  
-		<local_vocabulary name="areas" file="areas.xml" />
-		<local_vocabulary name="compatibility" file="compatibility.xml" />
-		<local_vocabulary name="accessModes" file="accessmode.xml" />
-	</vocabularies>
-
-	<transformers>
-		<transformer name="datasourceVocabularyTransformer">
-			<transformation xslt="datasource_mini.xsl" />
-		</transformer>
-
-		<transformer name="projectVocabularyTransformer">
-			<transformation xslt="project_mini.xsl" />
-		</transformer>
-
-		<transformer name="results_openaire">
-			<transformation xslt="result.xsl" />
-	 		<transformation match="language" change="value" vocabulary="languages" />
-			<transformation match="funding.funding_level_0" change="value" vocabulary="funders" />
-			<transformation match="funding.funding_level_1" change="value" vocabulary="programmes" />
-			<transformation match="funding.funding_level_2" change="value" vocabulary="areas" />
-			<transformation match="datasource.hostedby" change="value" vocabulary="datasources" />
-			<transformation match="datasource.licenceid" change="value" vocabulary="accessModes" />
-		</transformer>
-
-		<transformer name="projects_openaire">
-			<transformation xslt="project.xsl" />
-		</transformer>
-
-		<transformer name="datasources_openaire">
-			<transformation xslt="datasource.xsl" />
-		</transformer>
-
-		<!-- valid for every browse result of every entity type -->
-		<transformer name="results_openaire_browse">
-			<transformation xslt="browse.xsl" />
-			<transformation match="resultlanguageid.value" change="value" vocabulary="languages" />
-			<transformation match="organizationcountryid.value" change="value" vocabulary="countries" />
-
-			<transformation match="relfundinglevel0_id.value" change="value" vocabulary="funders" />
-			<transformation match="relfundinglevel1_id.value" change="value" vocabulary="programmes" />
-			<transformation match="relfundinglevel2_id.value" change="value" vocabulary="areas" />
-			<transformation match="resulthostingdatasourceid.value" change="value" vocabulary="datasources" />
-
-			<transformation match="datasourcecompatibilityid.value" change="value" vocabulary="compatibility"/>
-			<transformation match="resultrightsid.value" change="value" vocabulary="accessModes" />
-			<transformation match="relprojectid.value" change="value" vocabulary="projects" />
-		</transformer>
-
-		<transformer name="persons_openaire">
-			<transformation xslt="person.xsl" />
-		</transformer>
-
-		<transformer name="organizations_openaire">
-			<transformation xslt="organization.xsl" />
-		</transformer>
-		
-	</transformers>
-
-	<formatters>
-		<formatter name="json" xslt="json.xsl"/> 
-		<formatter name="xml" xslt="simple.xsl"/>
-		<formatter name="vocabulary" xslt="vocabulary.xsl"/>
-	</formatters>
-</configuration>
-	
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/result.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/result.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/result.xsl	(nonexistent)
@@ -1,782 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-xmlns:dri="http://www.driver-repository.eu/namespace/dri"
-xmlns:oaf="http://namespace.openaire.eu/oaf"
-xmlns:dc="http://purl.org/dc/elements/1.1/">
-<xsl:output method="xml" indent="yes" encoding="UTF-8"/>
-
-<xsl:template match = "/">
-
-<result type ="result">
-	<xsl:apply-templates select="//header"/>
-    <xsl:apply-templates select="//children/result"/>
-	<xsl:apply-templates select="//oaf:result"/>
-	<xsl:apply-templates select="//rel"/>
-	<xsl:apply-templates select="//children"/>
-    <xsl:apply-templates select="//extraInfo"/>
-</result>
-</xsl:template>
-
-<!-- HEADER
-fields in header:
-1. dri:objIdentifier 		[objIdentifier]
-2. dri:repositoryId			X
-3. dri:dateOfCollection		X
--->
-
-<xsl:template match="text()">
-	<xsl:value-of select="replace(., '[&#x007F;-&#x009F;]', ' ')"/>
-</xsl:template>
-
-<xsl:template match = "header">
-	<field name="resultId" multiplicity="false" indexId="objIdentifier" label="Object id">
-		<xsl:attribute name="value">
-			<xsl:value-of select='./dri:objIdentifier'/>
-		</xsl:attribute>
-	</field>
-
-	<field name="underCuration" multiplicity="false" indexId="" label="Under Curation">
-		<xsl:attribute name="value">
-			<xsl:value-of select='./dri:status'/>
-		</xsl:attribute>
-	</field>
-
-	<!--<field name="repositoryId" multiplicity="false" indexId="???" label="???">
-		<xsl:attribute name="value">
-			<xsl:value-of select='./dri:repositoryId'/>
-		</xsl:attribute>
-	</field>-->
-	<!--<field name="dateOfCollection" multiplicity="false" indexId="???" label="???">
-		<xsl:attribute name="value">
-			<xsl:value-of select='./dri:dateOfCollection'/>
-		</xsl:attribute>
-	</field>-->
-</xsl:template>
-
-
-<xsl:template match = "oaf:result">
-
-	<xsl:for-each select = "./title">
-		<field name="title" indexId = "resulttitle" multiplicity="true" label="Title">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./dateofacceptance">
-		<field name="dateofacceptance" indexId = "resultdateofacceptance" multiplicity="true" label="Date of acceptance">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./storagedate">
-		<field name="storagedate" indexId = "resultstoragedate" multiplicity="true" label="Date of storage">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select="./creator">
-		<field name="hasAuthor">
-			<field name="fullname">
-				<xsl:attribute name="value">
-					<xsl:value-of select='.'/>
-				</xsl:attribute>
-			</field>
-			<field name="ranking">
-				<xsl:attribute name="value">
-					<xsl:value-of select='./@rank'/>
-				</xsl:attribute>
-			</field>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./description">
-		<field name="description" indexId = "resultdescription" multiplicity="true" label="Description">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./publisher">
-		<field name="publisher" indexId = "resultpublisher" multiplicity="true" label="Publisher(s)">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./language">
-		<field name="languageid" indexId = "resultlanguageid" multiplicity="true" label="Language(s)">
-			<xsl:attribute name="value">
-				<xsl:value-of select='./@classid'/>
-			</xsl:attribute>
-		</field>
-		<field name="languagename" indexId = "resultlanguagename" multiplicity="true" label="Language(s)">
-			<xsl:attribute name="value">
-				<xsl:value-of select='./@classname'/>
-			</xsl:attribute>
-		</field>
-		<field name="language" indexId = "" multiplicity="true" label="Language(s)">
-			<xsl:attribute name="value">
-				<xsl:value-of select='./@classname'/>
-			</xsl:attribute>
-			<xsl:attribute name="value_original">
-				<xsl:value-of select='./@classid'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./resulttype">
-		<field name="resulttypeid" indexId = "resulttypeid" multiplicity="true" label="Type">
-			<xsl:attribute name="value">
-				<xsl:value-of select='./@classid'/>
-			</xsl:attribute>
-		</field>
-		<field name="resulttypename" indexId = "resulttypename" multiplicity="true" label="Type">
-			<xsl:attribute name="value">
-				<xsl:value-of select='./@classname'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./resourcetype">
-		<field name="resourcetypeid" indexId = "" multiplicity="true" label="Resource Type">
-			<xsl:attribute name="value">
-				<xsl:value-of select='./@classid'/>
-			</xsl:attribute>
-		</field>
-		<field name="resourcetypename" indexId = "" multiplicity="true" label="Resource Type">
-			<xsl:attribute name="value">
-				<xsl:value-of select='./@classname'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./subject">
-		<field name="subject" indexId = "resultsubject" multiplicity="true" label="Subject">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
- 			<field name = "inferred" indexId="" multiplicity = "false" label="inferred">
-				<xsl:attribute name="value">
-					<xsl:choose>
-						<xsl:when test="@inferred !=''">
-							<xsl:value-of select="@inferred"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:text>false</xsl:text>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:attribute>
-			</field>
-			<field name = "trust" indexId="" multiplicity = "false" label="trust level">
-				<xsl:attribute name="value">
-					<xsl:choose>
-						<xsl:when test="@trust !=''">
-							<xsl:value-of select="@trust"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:text>NEUTRAL</xsl:text>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:attribute>
-			</field>
-            <field name = "provenance" indexId="" multiplicity = "false" label="provenance">
-				<xsl:attribute name="value">
-				<xsl:choose>
-						<xsl:when test="@provenanceaction !=''">
-							<xsl:value-of select="@provenanceaction"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:text></xsl:text>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:attribute>
-			</field>
-			<field name="taxonomy" indexId="" multiplicity="false">
-				<xsl:attribute name="value">
-					<xsl:choose>
-						<xsl:when test="@classname !=''">
-							<xsl:value-of select="@classname"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:text></xsl:text>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:attribute>
-			</field>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./relevantdate">
-		<field name="relevantyear" indexId = "" multiplicity="true" label="Relevant year">
-			<xsl:attribute name="value">
-				<xsl:value-of select='substring-before(.,"-")'/>
-			</xsl:attribute>
-		</field>
-		<field name="relevantdate" indexId = "resultdate" multiplicity="true" label="Relevant date">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./pid">
-		<field name="pid" multiplicity="true" label="Pid">
-			<field name="value" indexId = "pid" multiplicity="false" label="Pid">
-				<xsl:attribute name="value">
-					<xsl:value-of select='.'/>
-				</xsl:attribute>
-			</field>
-			<field name="classid" indexId = "pidclassid" multiplicity="false" label="Pid class id">
-				<xsl:attribute name="value">
-					<xsl:value-of select='./@classid'/>
-				</xsl:attribute>
-			</field>
-			<field name="classname" indexId = "pidclassname" multiplicity="false" label="Pid class name">
-				<xsl:attribute name="value">
-					<xsl:value-of select='./@classname'/>
-				</xsl:attribute>
-			</field>
-		</field>
-	</xsl:for-each>
-
-    <xsl:for-each select="./bestaccessright">
-        <field name="bestaccessright" indexId="resultbestaccessright" multiplicity="false" label="Best License">
-            <xsl:attribute name="value">
-                <xsl:value-of select="@classid" />
-            </xsl:attribute>
-        </field>
-    </xsl:for-each>
-
-	<xsl:for-each select = "./embargoenddate">
-		<field name="embargoendyear" indexId = "" multiplicity="true" label="Embargo end year">
-			<xsl:attribute name="value">
-				<xsl:value-of select='substring-before(.,"-")'/>
-			</xsl:attribute>
-		</field>
-		<field name="embargoenddate" indexId = "resultembargoenddate" multiplicity="true" label="Embargo end date">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./journal">
-		<field name="journal" indexId = "" multiplicity="true" label="Journal">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./collectedfrom">
-		<field name="collectedfrom">
-			<field name="collectedfromid" indexId = "resultcollectedfromdatasourceid" multiplicity="true" label="Collected from">
-				<xsl:attribute name="value">
-				        <xsl:value-of select='./@id'/>
-				</xsl:attribute>
-			</field>
-			<field name="collectedfromname" indexId = "" multiplicity="true" label="Collected from">
-				<xsl:attribute name="value">
-				        <xsl:value-of select='./@name'/>
-				</xsl:attribute>
-			</field>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./device">
-		<field name="device" indexId = "" multiplicity="true" label="Device">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./size">
-		<field name="size" indexId = "" multiplicity="true" label="Size">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./format">
-		<field name="format" indexId = "" multiplicity="true" label="Format">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./version">
-		<field name="version" indexId = "" multiplicity="true" label="Version">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./lastmetadataupdate">
-		<field name="lastmetadataupdate" indexId = "" multiplicity="true" label="Last metadata update">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./metadataversionnumber">
-		<field name="metadataversionnumber" indexId = "" multiplicity="true" label="Metadata version number">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./source">
-		<field name="source" indexId = "" multiplicity="true" label="source">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./context">
-		<field indexId="context" multiplicity="true" name="context" >
-
-			<xsl:attribute name="value">
-				<xsl:value-of select='./@value'/>
-			</xsl:attribute>
-			<xsl:attribute name="value_original">
-				<xsl:value-of select='./@id'/>
-			</xsl:attribute>
-
-			<field name="contexttype" indexId="contexttype" multiplicity="false" label="Context Type">
-				<xsl:attribute name="value">
-					<xsl:value-of select="@type"></xsl:value-of>
-				</xsl:attribute>
-			</field>
-
-			<xsl:for-each select = "./category">
-				<field name="category" indexId="category" multiplicity="true" label="Category" >
-					<xsl:attribute name="value">
-						<xsl:value-of select='./@label' />
-					</xsl:attribute>
-					<xsl:attribute name="value_original">
-						<xsl:value-of select='./@id'/>
-					</xsl:attribute>
-
-					<xsl:for-each select = ".//concept">
-						<field name="concept" indexId="concept" multiplicity="true" label="Concept" >
-							<xsl:attribute name="value">
-								<xsl:value-of select='./@label'/>
-							</xsl:attribute>
-							<xsl:attribute name="value_original">
-								<xsl:value-of select='./@id'/>
-							</xsl:attribute>
-						</field>
-					</xsl:for-each>
-				</field>
-			</xsl:for-each>
-		</field>
-	</xsl:for-each>
-</xsl:template>
-
-
-<xsl:template match="extraInfo">
-    <xsl:for-each select="./citations/citation">
-        <field name="citation" multiplicity="true" indexId="" label="Citation">
-            <field name="rawText" multiplicity="false" indexId="" label="Citation Text">
-                <xsl:attribute name="value">
-                    <xsl:value-of select="rawText"/>
-                </xsl:attribute>
-            </field>
-            <xsl:for-each select="id">
-            <field name="citationId" indexId="" multiplicity="true" label="Citation id details">
-                <field name="id" multiplicity="false" indexId="" label="Citation id">
-                    <xsl:attribute name="value">
-                        <xsl:value-of select="@value"/>
-                    </xsl:attribute>
-                </field>
-                <field name="type" multiplicity="false" indexId="" label="Citation id type">
-                    <xsl:attribute name="value">
-                        <xsl:value-of select="@type"/>
-                    </xsl:attribute>
-                </field>
-                <field name="confidenceLevel" multiplicity="false" indexId="" label="Citation id confidence">
-                    <xsl:attribute name="value">
-                        <xsl:value-of select="@confidenceLevel"/>
-                    </xsl:attribute>
-                </field>
-            </field>
-            </xsl:for-each>
-        </field>
-    </xsl:for-each>
-</xsl:template>
-
-<xsl:template match="rel">
-<!--PROJECT-->
-	<xsl:if test="./to/@type='project'">
-		<field name="project" indexId = "objIdentifier" multiplicity="true">
-			<xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-			<field name = "inferred" indexId="" multiplicity = "false" label="inferred">		
-				<xsl:attribute name="value">
-					<xsl:choose>
-						<xsl:when test="@inferred !=''">
-							<xsl:value-of select="@inferred"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:text>false</xsl:text>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:attribute>
-			</field>
-			<field name = "trust" indexId="" multiplicity = "false" label="trust level">
-				<xsl:attribute name="value">
-					<xsl:choose>
-						<xsl:when test="@trust !=''">
-							<xsl:value-of select="@trust"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:text>NEUTRAL</xsl:text>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:attribute>
-			</field>
-			<field name = "provenance" indexId="" multiplicity = "false" label="provenance">
-				<xsl:attribute name="value">
-				<xsl:choose>
-						<xsl:when test="@provenanceaction !=''">
-							<xsl:value-of select="@provenanceaction"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:text></xsl:text>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:attribute>
-			</field>
-			<field name = "projectId" indexId ="objIdentifier" multiplicity="false" label="Project id">		
-				<xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-			</field>
-			<field name = "role" indexId ="" multiplicity="false" label="role">		
-				<xsl:attribute name="value"><xsl:value-of select='./to/@class'/> </xsl:attribute>
-			</field>
-			<field name = "projectcode" indexId ="projectcode" multiplicity="false" label="Project(s)">		
-				<xsl:attribute name="value"><xsl:value-of select='./code'/> </xsl:attribute>
-			</field>	
-			<field name = "projectacronym" indexId ="projectacronym" multiplicity="false" label="Project(s)">		
-				<xsl:attribute name="value"><xsl:value-of select='./acronym'/> </xsl:attribute>
-			</field>
-			<field name = "projecttitle" indexId ="projecttitle" multiplicity="false" label="Project title">		
-				<xsl:attribute name="value"><xsl:value-of select='./title'/> </xsl:attribute>
-			</field>
-			<field name = "projectcontracttypeid" indexId ="projectcontracttypeid" multiplicity="false" label="Project contract type id">		
-				<xsl:attribute name="value"><xsl:value-of select='./contracttype/@classid'/> </xsl:attribute>
-			</field>
-			<field name = "projectcontracttypename" indexId ="projectcontracttypename" multiplicity="false" label="Project contract type name">		
-				<xsl:attribute name="value"><xsl:value-of select='./contracttype/@classname'/> </xsl:attribute>
-			</field>
-			<field name = "funding" indexId = "" multiplicity = "false">
-                <field name = "funder" indexId = "relfunder" multiplicity = "true">
-                    <xsl:attribute name="value_original">
-                        <xsl:value-of select="./funding/funder/@id"/>
-                    </xsl:attribute>
-                    <xsl:attribute name = "value">
-                        <xsl:call-template name="getExtension">
-                            <xsl:with-param name="filename" select="./funding/funder/@id"/>
-                        </xsl:call-template>
-                        <!--xsl:value-of select='./funding/funding_level_0'/-->
-                    </xsl:attribute>
-                </field>
-                <field name = "fundershortname" indexId = "relfundershortname" multiplicity = "true">
-                    <xsl:attribute name = "value">
-                        <xsl:call-template name="getExtension">
-                            <xsl:with-param name="filename" select="./funding/funder/@shortname"/>
-                        </xsl:call-template>
-                    </xsl:attribute>
-                </field>
-                <field name = "funding_level_0" indexId = "fundinglevel0_id" multiplicity = "false">
-					<xsl:attribute name="value_original">
-						<xsl:value-of select="./funding/funding_level_0"/>
-					</xsl:attribute>
-					<xsl:attribute name = "value">
-						<xsl:call-template name="getExtension">
-							<xsl:with-param name="filename" select="./funding/funding_level_0/@name"/>
-						</xsl:call-template>
-						<!--xsl:value-of select='./funding/funding_level_0'/-->
-					</xsl:attribute>
-				</field>
-				<field name = "funding_level_1" indexId = "fundinglevel1_id" multiplicity = "false">
-                    <xsl:if test="not(starts-with(./funding/funding_level_1, 'ec__________::EC::FP7::'))">
-                        <xsl:attribute name="value_original">
-                            <xsl:value-of select="./funding/funding_level_1"/>
-                        </xsl:attribute>
-                        <xsl:attribute name = "value">
-                            <xsl:call-template name="getExtension">
-                                <xsl:with-param name="filename" select="./funding/funding_level_1/@name"/>
-                            </xsl:call-template>
-                        </xsl:attribute>
-                    </xsl:if>
-                    <xsl:if test="starts-with(./funding/funding_level_1, 'ec__________::EC::FP7::')">
-                        <xsl:attribute name="value">
-							<xsl:value-of select="./funding/funding_level_1"/>
-                        </xsl:attribute>
-                    </xsl:if>
-					<!--<xsl:attribute name = "value">
-						<xsl:call-template name="getExtension">
-							<xsl:with-param name="filename" select="./funding/funding_level_1"/>
-						</xsl:call-template>	
-						&lt;!&ndash;xsl:value-of select='./funding/funding_level_1'/&ndash;&gt;
-					</xsl:attribute>-->
-				</field>
-				<field name = "funding_level_2" indexId = "fundinglevel2_id" multiplicity = "false">
-                    <xsl:if test="not(starts-with(./funding/funding_level_2, 'ec__________::EC::FP7::'))">
-                        <xsl:attribute name="value_original">
-                            <xsl:value-of select="./funding/funding_level_2"/>
-                        </xsl:attribute>
-                        <xsl:attribute name = "value">
-                            <xsl:call-template name="getExtension">
-                                <xsl:with-param name="filename" select="./funding/funding_level_2/@name"/>
-                            </xsl:call-template>
-                        </xsl:attribute>
-                    </xsl:if>
-                    <xsl:if test="starts-with(./funding/funding_level_2, 'ec__________::EC::FP7::')">
-                        <xsl:attribute name="value">
-							<xsl:value-of select="./funding/funding_level_2"/>
-                        </xsl:attribute>
-                    </xsl:if>
-				<!-- <xsl:attribute name = "value">
-						<xsl:call-template name="getExtension">
-							<xsl:with-param name="filename" select="./funding/funding_level_2"/>
-						</xsl:call-template>
-					</xsl:attribute>
-				-->
-				</field>
-			</field>
-		</field>
-	</xsl:if>
-<!--RESULT-->
-	<xsl:if test="./to/@type='result'">
-		<field indexId = "objIdentifier"  multiplicity="true">
-			<xsl:attribute name="name"><xsl:value-of select='./to/@class'/></xsl:attribute>
-			<xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-			<field name = "resultid" indexId ="objIdentifier" multiplicity="false" label="Result id">		
-				<xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-			</field>
-			<field name = "title" indexId = "resulttitle" multiplicity = "false" label = "Title">
-				<xsl:attribute name="value">
-					<xsl:value-of select="./title"/>
-				</xsl:attribute>
-			</field>
-			<field name = "dateofacceptance" indexId = "resultdateofacceptance" multiplicity = "false" label = "Date of acceptance">
-				<xsl:attribute name="value">
-					<xsl:value-of select="./dateofacceptance"/>
-				</xsl:attribute>
-			</field>
-			<field name = "resulttypeid" indexId = "resulttypeid" multiplicity = "false" label = "type id">
-				<xsl:attribute name="value">
-					<xsl:value-of select="./resulttype/@classid"/>
-				</xsl:attribute>
-			</field>
-			<field name = "resulttypename" indexId = "resulttypename" multiplicity = "false" label = "type name">
-				<xsl:attribute name="value">
-					<xsl:value-of select="./resulttype/@classname"/>
-				</xsl:attribute>
-			</field>
-			<field name = "inferred" indexId="" multiplicity = "false" label="inferred">		
-				<xsl:attribute name="value">
-					<xsl:choose>
-						<xsl:when test="@inferred !=''">
-							<xsl:value-of select="@inferred"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:text>false</xsl:text>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:attribute>
-			</field>
-			<field name = "trust" indexId="" multiplicity = "false" label="trust level">
-				<xsl:attribute name="value">
-					<xsl:choose>
-						<xsl:when test="@trust !=''">
-							<xsl:value-of select="@trust"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:text>NEUTRAL</xsl:text>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:attribute>
-			</field>
-			<field name = "provenance" indexId="" multiplicity = "false" label="provenance">
-				<xsl:attribute name="value">
-				<xsl:choose>
-						<xsl:when test="@provenanceaction !=''">
-							<xsl:value-of select="@provenanceaction"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:text></xsl:text>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:attribute>
-			</field>
-            <xsl:if test="./to/@class = 'hasAmongTopNSimilarDocuments'">
-                <field name="similarity" label="similarity" multiplicity="false" indexId="">
-                    <xsl:attribute name="value">
-                        <xsl:value-of select="similarity"/>
-                    </xsl:attribute>
-                </field>
-            </xsl:if>
-		</field>
-	</xsl:if>	
-<!--ORGANIZATION-->
-	<xsl:if test="./to/@type='organization'">
-		<field name="organization" indexId = "objIdentifier"  multiplicity="true">
-			<xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-			<field name = "organizationid" indexId ="objIdentifier" multiplicity="false" label="Organization id">		
-				<xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-			</field>
-			<field name = "role" indexId ="" multiplicity="false" label="role">		
-				<xsl:attribute name="value"><xsl:value-of select='./to/@class'/> </xsl:attribute>
-			</field>
-			<field name = "legalshortname" indexId ="organizationlegalshortname" multiplicity="false" label="Organization short name">		
-				<xsl:attribute name="value"><xsl:value-of select='./legalshortname'/> </xsl:attribute>
-			</field>
-			<field name = "websiteurl" indexId ="organizationwebsiteurl" multiplicity="false" label="Website">		
-				<xsl:attribute name="value"><xsl:value-of select='./websiteurl'/> </xsl:attribute>
-			</field>
-			<field name = "countryid" indexId ="organizationcountryid" multiplicity="false" label="Country code">		
-				<xsl:attribute name="value"><xsl:value-of select='./country/@classid'/> </xsl:attribute>
-			</field>
-			<field name = "countryname" indexId ="organizationcountryname" multiplicity="false" label="Country">		
-				<xsl:attribute name="value"><xsl:value-of select='./country/@classname'/> </xsl:attribute>
-			</field>
-			<field name = "participantnumber" indexId ="" multiplicity="false" label="Participant Number">		
-				<xsl:attribute name="value"><xsl:value-of select='./participantnumber'/> </xsl:attribute>
-			</field>
-			<field name = "contactperson" indexId ="" multiplicity="false" label="Contact Person">		
-				<xsl:attribute name="value"><xsl:value-of select='./contactperson'/> </xsl:attribute>
-			</field>
-		</field>
-	</xsl:if>
-
-</xsl:template>
-<!-- CHILDREN -->
-
-    <xsl:template match="children/result">
-        <field name="resultId" multiplicity="true" indexId="resultid" label="Result id">
-            <xsl:attribute name="value">
-                <xsl:value-of select='./@objidentifier'/>
-            </xsl:attribute>
-        </field>
-    </xsl:template>
-
-    <xsl:template match="children">
-
-	<xsl:for-each select = "./instance">
-		<field name = "datasource"  indexId = "resultcollectedfromdatasourceid" multiplicity="true">
-			<xsl:attribute name = "value"> <xsl:value-of select="./@id"/> </xsl:attribute><!--??-->
-			<field name = "instanceId" indexId = "objIdentifier" multiplicity = "false">
-				<xsl:attribute name="value"><xsl:value-of select="./@id"/></xsl:attribute>
-			</field>
-			<field name = "hostedby" indexId = "resulthostingdatasourceid" multiplicity="false">
-				<xsl:attribute name = "value"> <xsl:value-of select="./hostedby/@id"/> </xsl:attribute>
-			</field> 
-			<field name = "hostedbyname" indexId = "resulthostingdatasourcename" multiplicity="false">
-				<xsl:attribute name = "value"> <xsl:value-of select="./hostedby/@name"/> </xsl:attribute>
-			</field>
-			<xsl:for-each select="./accessright">
-				<field name = "accessrightid" indexId = "" multiplicity = "true">
-					<xsl:attribute name = "value"> <xsl:value-of select="./@classid"/> </xsl:attribute>
-				</field>
-				<field name = "accessrightname" indexId = "resultrights" multiplicity = "true">
-					<xsl:attribute name = "value"> <xsl:value-of select="./@classname"/> </xsl:attribute>
-				</field>
-			</xsl:for-each>
-			<xsl:for-each select="./instancetype">			
-				<field name = "typeid" indexId = "instancetypeid" multiplicity = "true">
-					<xsl:attribute name = "value"> <xsl:value-of select="./@classid"/> </xsl:attribute>
-				</field>
-				<field name = "typename" indexId = "instancetypename" multiplicity = "true">
-					<xsl:attribute name = "value"> <xsl:value-of select="./@classname"/> </xsl:attribute>
-				</field>
-			</xsl:for-each>
-
-			<xsl:for-each select="./webresource">	
-				<field name = "webresource" indexId = "" multiplicity="true">
-					<xsl:attribute name = "value"> <xsl:value-of select="."/> </xsl:attribute>
-				</field>
-				<xsl:for-each select="./url">	
-					<field name = "url" indexId = "" multiplicity="true">
-						<xsl:attribute name = "value"> <xsl:value-of select="."/> </xsl:attribute>
-					</field>
-				</xsl:for-each>
-			</xsl:for-each>
-			<!--field name = "officialname" indexId = "" multiplicity="false">
-				<xsl:attribute name = "value"> <xsl:value-of select="./datasource/officialname"/> </xsl:attribute>
-			</field>
-			<field name = "datasourcetypeid" indexId = "" multiplicity = "true">
-				<xsl:attribute name = "value"> <xsl:value-of select="./datasource/datasourcetype/@classid"/> </xsl:attribute>
-			</field>
-			<field name = "datasourcetypename" indexId = "" multiplicity = "true">
-				<xsl:attribute name = "value"> <xsl:value-of select="./datasource/datasourcetype/@classname"/> </xsl:attribute>
-			</field-->
-			
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./externalreference">
-		<field name="externalreference" multiplicity="true" indexId="">
-			<field name="sitename" multiplicity="false" indexId="">
-				<xsl:attribute name="value">
-					<xsl:value-of select="./sitename"/>
-				</xsl:attribute>
-			</field>
-			<field name="label" multiplicity="false" indexId="">
-				<xsl:attribute name="value">
-					<xsl:value-of select="./label"/>
-				</xsl:attribute>
-			</field>
-			
-			<field name="url" multiplicity="false" indexId="">
-				<xsl:attribute name="value">
-					<xsl:value-of select="./url"/>
-				</xsl:attribute>
-			</field>
-
-			<field name="typeid" multiplicity="false" indexId="">
-				<xsl:attribute name="value">
-					<xsl:value-of select="./qualifier/@classid"/>
-				</xsl:attribute>
-			</field>
-			<field name="refidentifier" multiplicity="false" indexId="">
-				<xsl:attribute name="value">
-					<xsl:value-of select="./refidentifier"/>
-				</xsl:attribute>
-			</field>
-		</field>
-	</xsl:for-each>
-</xsl:template>
-
-<xsl:template name="getExtension">
-	<xsl:param name="filename"/>
-	<xsl:choose>
-		<xsl:when test="contains($filename, '::')">
-			<xsl:call-template name="getExtension">
-				<xsl:with-param name="filename" select="substring-after($filename, '::')"/>
-			</xsl:call-template>
-		</xsl:when>
-		<xsl:otherwise>
-			<xsl:value-of select="$filename"/>
-		</xsl:otherwise>
-	</xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
-
-
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/csv_organization.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/csv_organization.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/csv_organization.xsl	(nonexistent)
@@ -1,43 +0,0 @@
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:dri="http://www.driver-repository.eu/namespace/dri"
-                xmlns:oaf="http://namespace.openaire.eu/oaf"
-                xmlns:dc="http://purl.org/dc/elements/1.1/">
-
-    <!-- Turn off auto-insertion of <?xml> tag and set indenting on -->
-    <xsl:output method="text" encoding="utf-8" omit-xml-declaration="yes" media-type="text/csv" />
-
-    <!-- strip whitespace from whitespace-only nodes -->
-    <xsl:strip-space elements="*"/>
-
-    <xsl:template match = "/">
-        <xsl:apply-templates select="//oaf:organization"/>
-    </xsl:template>
-
-    <!-- Name, Projects, Country -->
-    <xsl:template match="oaf:organization">
-
-        <!-- Title -->
-        <xsl:text>"</xsl:text>
-        <xsl:value-of select="legalname"/>
-        <xsl:text>",</xsl:text>
-
-        <xsl:for-each select="rels/rel/to[@class='isParticipant']">
-            <xsl:value-of select="../funding/funder/@shortname"/>
-            <xsl:text>|</xsl:text>
-            <xsl:value-of select="../acronym"/>
-            <xsl:text>(</xsl:text>
-            <xsl:value-of select="../code"/>
-            <xsl:text>)</xsl:text>
-            <xsl:if test="not(position()=last())">
-                <xsl:text>;</xsl:text>
-            </xsl:if>
-        </xsl:for-each>
-        <xsl:text>,</xsl:text>
-
-        <xsl:value-of select="country/@classname"/>
-        <xsl:text>&#xd;</xsl:text>
-
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/csv_project.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/csv_project.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/csv_project.xsl	(nonexistent)
@@ -1,52 +0,0 @@
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:dri="http://www.driver-repository.eu/namespace/dri"
-                xmlns:oaf="http://namespace.openaire.eu/oaf"
-                xmlns:dc="http://purl.org/dc/elements/1.1/">
-
-    <!-- Turn off auto-insertion of <?xml> tag and set indenting on -->
-    <xsl:output method="text" encoding="utf-8" omit-xml-declaration="yes" media-type="text/csv" />
-
-    <!-- strip whitespace from whitespace-only nodes -->
-    <xsl:strip-space elements="*"/>
-
-
-    <xsl:template match = "/">
-        <xsl:apply-templates select="//oaf:project"/>
-    </xsl:template>
-
-    <!-- Title, Funder, Start Date, End Date, Participants -->
-    <xsl:template match="oaf:project">
-        <!-- Title -->
-        <xsl:text>"</xsl:text>
-        <xsl:value-of select="title"/>
-        <xsl:text>",</xsl:text>
-
-        <!-- Funder -->
-        <xsl:value-of select="fundingtree/funder/name"/>
-        <xsl:text>(</xsl:text>
-        <xsl:value-of select="fundingtree/funder/shortname"/>
-        <xsl:text>),</xsl:text>
-
-        <!-- Start Date -->
-        <xsl:value-of select="startdate"/>
-        <xsl:text>,</xsl:text>
-
-        <!-- End Date -->
-        <xsl:value-of select="enddate"/>
-        <xsl:text>,</xsl:text>
-
-        <!-- Participants -->
-        <xsl:for-each select="rels/rel/to[@class='hasParticipant']">
-            <xsl:text>"</xsl:text>
-            <xsl:value-of select="../legalname"/>
-            <xsl:text>"</xsl:text>
-            <xsl:if test="not(position()=last())">
-                <xsl:text>;</xsl:text>
-            </xsl:if>
-        </xsl:for-each>
-        <xsl:text>&#xd;</xsl:text>
-        
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/project_csv.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/project_csv.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/project_csv.xsl	(nonexistent)
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:dri="http://www.driver-repository.eu/namespace/dri"
-                xmlns:oaf="http://namespace.openaire.eu/oaf"
-                xmlns:dc="http://purl.org/dc/elements/1.1/">
-
-    <!-- Turn off auto-insertion of <?xml> tag and set indenting on -->
-    <xsl:output method="text" encoding="utf-8" omit-xml-declaration="yes" media-type="text/csv" />
-
-    <!-- strip whitespace from whitespace-only nodes -->
-    <xsl:strip-space elements="*"/>
-
-    <xsl:template match = "/">
-        <xsl:text disable-output-escaping="yes">Project title,Project Acronym,Project ID,Funder,Funding Stream,Funding Substream level 1,Funding Substream level 2,SC39,Start Date,End Date&#xD;</xsl:text>
-        <xsl:apply-templates select="//oaf:project"/>
-    </xsl:template>
-
-    <!-- Project title, Project Acronym, Project ID, Funder, Funding Stream, Funding Substream level 1, Funding Substream level 2, SC39, Start Date, End Date -->
-    <xsl:template match="//oaf:project">
-
-        <xsl:for-each select="fundingtree">
-            <!-- Project title -->
-            <xsl:text>&quot;</xsl:text>
-            <xsl:value-of select="../title"/>
-            <xsl:text>&quot;</xsl:text>
-            <xsl:text>,</xsl:text>
-
-            <!-- Project Acronym -->
-            <xsl:text>&quot;</xsl:text>
-            <xsl:value-of select="../acronym"/>
-            <xsl:text>&quot;</xsl:text>
-            <xsl:text>,</xsl:text>
-
-            <!-- Project ID -->
-            <xsl:text>&quot;</xsl:text>
-            <xsl:value-of select="../code"/>
-            <xsl:text>&quot;</xsl:text>
-            <xsl:text>,</xsl:text>
-
-            <!-- Funder -->
-            <!--<xsl:for-each select="funder">-->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:value-of select="funder/shortname"/>
-                <xsl:text>&quot;</xsl:text>
-            <!--</xsl:for-each>-->
-            <xsl:text>,</xsl:text>
-
-            <!-- Funding Stream-->
-            <!--<xsl:for-each select="funding_level_2/parent/funding_level_1/parent/funding_level_0">-->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:value-of select=".//funding_level_0/name"/>
-                <xsl:text>&quot;</xsl:text>
-            <!--</xsl:for-each>-->
-            <xsl:text>,</xsl:text>
-
-            <!-- Funding Substream Level 1 -->
-            <!--<xsl:for-each select="funding_level_2/parent/funding_level_1">-->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:value-of select=".//funding_level_1/name"/>
-                <xsl:text>&quot;</xsl:text>
-            <!--</xsl:for-each>-->
-            <xsl:text>,</xsl:text>
-
-            <!-- Funding Substream Level 2 -->
-            <!--<xsl:for-each select="funding_level_2">-->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:value-of select=".//funding_level_2/name"/>
-                <xsl:text>&quot;</xsl:text>
-            <!--</xsl:for-each>-->
-            <xsl:text>,</xsl:text>
-
-
-            <!-- SC39 -->
-            <xsl:text>&quot;</xsl:text>
-            <xsl:value-of select="../ecsc39"/>
-            <xsl:text>&quot;</xsl:text>
-            <xsl:text>,</xsl:text>
-
-            <!-- Start Date -->
-            <xsl:text>&quot;</xsl:text>
-            <xsl:value-of select="../startdate"/>
-            <xsl:text>&quot;</xsl:text>
-            <xsl:text>,</xsl:text>
-
-            <!-- End Date -->
-            <xsl:text>&quot;</xsl:text>
-            <xsl:value-of select="../enddate"/>
-            <xsl:text>&quot;</xsl:text>
-            <xsl:text>&#xD;</xsl:text>
-            </xsl:for-each>
-
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/csv_publication_special.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/csv_publication_special.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/csv_publication_special.xsl	(nonexistent)
@@ -1,146 +0,0 @@
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:dri="http://www.driver-repository.eu/namespace/dri"
-                xmlns:oaf="http://namespace.openaire.eu/oaf"
-                xmlns:dc="http://purl.org/dc/elements/1.1/">
-
-    <!-- Turn off auto-insertion of <?xml> tag and set indenting on -->
-    <xsl:output method="text" encoding="utf-8" omit-xml-declaration="yes" media-type="text/csv" />
-
-    <!-- strip whitespace from whitespace-only nodes -->
-    <xsl:strip-space elements="*"/>
-
-    <xsl:variable name="apos">'</xsl:variable>
-
-    <xsl:template match = "/">
-        <xsl:apply-templates select="//oaf:result"/>
-    </xsl:template>
-
-    <xsl:template match="text()">
-        <xsl:value-of select="replace(., '[&#x007F;-&#x009F;]', ' ')"/>
-    </xsl:template>
-
-    <!-- Title, Authors, Publication Year, DOI, Download from, Publication Type, Journal, Funder, Project Name (GA Number), Access -->
-
-    <xsl:template match="oaf:result">
-        <xsl:for-each select="rels/rel/to[@class='isProducedBy']">
-            <!-- Title -->
-            <xsl:text>"</xsl:text>
-            <xsl:call-template name="escape-quot-string">
-                <xsl:with-param name="s" select="../../../title"/>
-            </xsl:call-template>
-            <xsl:text>",</xsl:text>
-
-            <!-- Authors -->
-            <xsl:text>"</xsl:text>
-            <xsl:for-each select="../../../creator">
-                <xsl:sort select="@rank"/>
-                <xsl:value-of select="."/>
-                <xsl:if test="not(position()=last())">
-                    <xsl:text>;</xsl:text>
-                </xsl:if>
-            </xsl:for-each>
-            <xsl:text>"</xsl:text>
-            <xsl:text>,</xsl:text>
-            
-            <!-- Publication Year -->
-            <xsl:value-of select="../../../dateofacceptance"/>
-            <xsl:text>,</xsl:text>
-
-            <!-- DOI -->
-            <xsl:apply-templates select="pid"/>
-            <xsl:text>,</xsl:text>
-
-            <!-- Download from -->
-            <xsl:value-of select="../../../children/instance[1]/webresource[1]"/>
-            <xsl:text>,</xsl:text>
-
-
-            <!-- Publication Type -->
-            <xsl:value-of select="../../../children/instance[1]/instancetype/@classname"/>
-            <xsl:text>,</xsl:text>
-
-            <!-- Journal -->
-            <xsl:text>"</xsl:text>
-            <xsl:copy-of select="replace(../../../source, '&lt;/?\w+[^&lt;]*&gt;', '')"/>
-            <xsl:text>",</xsl:text>
-
-
-            <!-- Funder -->
-            <xsl:value-of select="../funding/funder/@name"/>
-            <xsl:text>(</xsl:text>
-            <xsl:value-of select="../funding/funder/@shortname"/>
-            <xsl:text>),</xsl:text>
-
-            <!-- Project Name (GA Number) -->
-            <xsl:choose>
-                <xsl:when test="../acronym">
-                    <xsl:value-of select="../acronym"/>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:text>"</xsl:text>
-                    <xsl:value-of select="../title"/>
-                    <xsl:text>"</xsl:text>
-                </xsl:otherwise>
-            </xsl:choose>
-            <xsl:text>(</xsl:text>
-            <xsl:value-of select="../code"/>
-            <xsl:text>),</xsl:text>
-
-            <!-- Access -->
-            <xsl:value-of select="../../../bestaccessright/@classname"/>
-            <xsl:text>&#xd;</xsl:text>
-
-        </xsl:for-each>
-
-    </xsl:template>
-
-    <xsl:template match="pid[@classid='doi']">
-        <xsl:value-of select="."/>
-    </xsl:template>
-
-    <xsl:template name="escape-quot-string">
-        <xsl:param name="s"/>
-        <xsl:choose>
-            <xsl:when test="contains($s,'&quot;')">
-                <xsl:call-template name="encode-string">
-                    <xsl:with-param name="s" select="concat(substring-before($s,'&quot;'),$apos)"/>
-                </xsl:call-template>
-                <xsl:call-template name="escape-quot-string">
-                    <xsl:with-param name="s" select="substring-after($s,'&quot;')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:call-template name="encode-string">
-                    <xsl:with-param name="s" select="$s"/>
-                </xsl:call-template>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template name="encode-string">
-        <xsl:param name="s"/>
-        <xsl:choose>
-            <!-- tab -->
-            <xsl:when test="contains($s,'&#x9;')">
-                <xsl:call-template name="encode-string">
-                    <xsl:with-param name="s" select="concat(substring-before($s,'&#x9;'),'\t',substring-after($s,'&#x9;'))"/>
-                </xsl:call-template>
-            </xsl:when>
-            <!-- line feed -->
-            <xsl:when test="contains($s,'&#xA;')">
-                <xsl:call-template name="encode-string">
-                    <xsl:with-param name="s" select="concat(substring-before($s,'&#xA;'),'\n',substring-after($s,'&#xA;'))"/>
-                </xsl:call-template>
-            </xsl:when>
-            <!-- carriage return -->
-            <xsl:when test="contains($s,'&#xD;')">
-                <xsl:call-template name="encode-string">
-                    <xsl:with-param name="s" select="concat(substring-before($s,'&#xD;'),'\r',substring-after($s,'&#xD;'))"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise><xsl:value-of select="$s"/></xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/datasource_type.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/datasource_type.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/datasource_type.xml	(nonexistent)
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value=""/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2008-06-25T14:50:49+02:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Datasource Types</VOCABULARY_NAME>
-
-            <TERMS>
-                <TERM code="aggregator::pubsrepository::institutional" english_name="Institutional Repository Aggregator" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="aggregator::pubsrepository::journals" native_name="" english_name="Journal Aggregator">
-                    <SYNONYMS/>
-		        </TERM>
-                <TERM code="aggregator::pubsrepository::unknown" native_name="" english_name="Publication Repository Aggregator">
-                    <SYNONYMS/>
-                </TERM>                
-                <TERM code="aggregator::datarepository" native_name="" english_name="Data Repository Aggregator">
-                    <SYNONYMS/>
-                </TERM>                
-                <TERM code="pubsrepository::institutional" native_name="" english_name="Institutional Repository">
-                    <SYNONYMS/>
-                </TERM>                
-                <TERM code="pubsrepository::thematic" native_name="" english_name="Thematic Repository">
-                    <SYNONYMS/>
-                </TERM>                
-                <TERM code="pubsrepository::unknown" native_name="" english_name="Publication Repository">
-                    <SYNONYMS/>
-                </TERM>                
-                <TERM code="pubsrepository::journal" native_name="" english_name="Journal">
-                    <SYNONYMS/>
-		        </TERM>
-                <TERM code="pubsrepository::mock" native_name="" english_name="Other">
-                    <SYNONYMS/>
-		        </TERM>
-                <TERM code="datarepository::unknown" native_name="" english_name="Data Repository">
-                    <SYNONYMS/>
-                </TERM>                
-		        <TERM code="entityregistry" native_name="" english_name="Registry">
-                    <SYNONYMS/>
-                </TERM>
-		        <TERM code="infospace" native_name="" english_name="Information Space">
-                    <SYNONYMS/>
-                </TERM>
-		        <TERM code="websource" native_name="" english_name="Web Source">
-                    <SYNONYMS/>
-                </TERM>
-		        <TERM code="scholarcomminfra" native_name="" english_name="Scholarly Comm. Infrastructure">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" code="pubscatalogue::unknown" english_name="Publication Catalogue" encoding="OPENAIRE">
-                    <SYNONYMS/>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-06-25T14:50:49+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/dc.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/dc.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/dc.xsl	(nonexistent)
@@ -1,116 +0,0 @@
-<xsl:stylesheet xmlns:dc="http://purl.org/dc/elements/1.1/"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
-	xmlns:oaf="http://namespace.openaire.eu/oaf" exclude-result-prefixes="oaf"
-	version="1.0">
-
-	<xsl:output indent="yes" method="xml" omit-xml-declaration="yes" />
-	<xsl:template match="//oaf:result">
-		<oai_dc:dc xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-			<xsl:apply-templates />
-		</oai_dc:dc>
-	</xsl:template>
-	<xsl:template match="subject">
-		<dc:subject>
-			<xsl:value-of select="." />
-		</dc:subject>
-	</xsl:template>
-	<xsl:template match="oaf:result/publisher">
-		<dc:publisher>
-			<xsl:value-of select="." />
-		</dc:publisher>
-	</xsl:template>
-
-	<!-- classname of instanceType for dataset is currently UNKNOWN and we want 
-		to skip it -->
-	<xsl:template
-		match="oaf:result/resulttype | instanceType[./@classname!='Unknown'] | resourceType[./@classname != '']">
-		<dc:type xml:lang="eng">
-			<xsl:value-of select="./@classname" />
-		</dc:type>
-	</xsl:template>
-	<xsl:template match="language[./@classid != '']">
-		<dc:language>
-			<xsl:value-of select="./@classid" />
-		</dc:language>
-	</xsl:template>
-	<xsl:template match="description">
-		<dc:description>
-			<xsl:value-of select="." />
-		</dc:description>
-	</xsl:template>
-	<xsl:template match="source | collectedFrom/@name">
-		<dc:source>
-			<xsl:value-of select="." />
-		</dc:source>
-	</xsl:template>
-	<xsl:template match="oaf:result/title">
-		<dc:title>
-			<xsl:value-of select="." />
-		</dc:title>
-	</xsl:template>
-	<xsl:template match="oaf:result/dateofacceptance">
-		<dc:date>
-			<xsl:value-of select="concat('date of acceptance: ', .)" />
-		</dc:date>
-	</xsl:template>
-	<xsl:template match="oaf:result/embargoenddate">
-		<dc:date>
-			<xsl:value-of select="concat('end of embargo: ', .)" />
-		</dc:date>
-	</xsl:template>
-	<xsl:template match="format">
-		<dc:format>
-			<xsl:value-of select="." />
-		</dc:format>
-	</xsl:template>
-	<xsl:template match="originalId | pid">
-		<dc:identifier>
-			<xsl:value-of select="." />
-		</dc:identifier>
-	</xsl:template>
-	<xsl:template match="bestaccessright">
-		<dc:rights>
-			<xsl:value-of select="./@classname" />
-		</dc:rights>
-	</xsl:template>
-	<xsl:template match="rel[./to/@class='author']">
-		<dc:creator>
-			<xsl:value-of select="./fullname" />
-		</dc:creator>
-	</xsl:template>
-	<xsl:template match="rel[./to/@class='contributor']">
-		<dc:contributor>
-			<xsl:value-of select="./fullname" />
-		</dc:contributor>
-	</xsl:template>
-	<xsl:template match="rel[./to/@class='isResultOf']">
-		<dc:relation>
-			<xsl:value-of select="concat(./acronym, ', grant id: ', ./code)" />
-		</dc:relation>
-	</xsl:template>
-
-	<!-- Links from dataset to publications: only title and openaire identifiers 
-		are available...would be better to have the original id, or a pid... -->
-	<xsl:template match="rel[/to/@class='isRelatedTo']">
-		<dc:relation>
-			<xsl:value-of select="./to" />
-		</dc:relation>
-		<dc:relation>
-			<xsl:value-of select="./title" />
-		</dc:relation>
-	</xsl:template>
-	<xsl:template match="context | category | concept">
-		<dc:relation>
-			<xsl:value-of select="./@label" />
-		</dc:relation>
-	</xsl:template>
-	<xsl:template match="webresource/url">
-		<dc:relation>
-			<xsl:value-of select="." />
-		</dc:relation>
-	</xsl:template>
-
-
-	<!-- Override default template -->
-	<xsl:template match="text()|@*" />
-</xsl:stylesheet>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/simple.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/simple.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/simple.xsl	(nonexistent)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-xmlns:dri="http://www.driver-repository.eu/namespace/dri"
-xmlns:oaf="http://namespace.openaire.eu/oaf">
-<xsl:output method="xml" indent="yes" encoding="UTF-8" />
-<xsl:template match="/">
-	<xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="@*|node()">
-	<xsl:copy>
-		<xsl:apply-templates select="@*|node()"/>
-	</xsl:copy>
-</xsl:template>
-	
-</xsl:stylesheet>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/datasource.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/datasource.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/datasource.xsl	(nonexistent)
@@ -1,365 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-xmlns:dri="http://www.driver-repository.eu/namespace/dri"
-xmlns:oaf="http://namespace.openaire.eu/oaf"
-xmlns:dc="http://purl.org/dc/elements/1.1/">
-<xsl:output method="xml" indent="yes" encoding="UTF-8"/>
-
-<xsl:template match = "/">
-<result type ="result">
-	<xsl:apply-templates select="//header"/>
-	<xsl:apply-templates select="//oaf:datasource"/>
-	<xsl:apply-templates select="//rel"/>
-</result>
-</xsl:template>
-
-
-<!-- HEADER
-fields in header:
-1. dri:objIdentifier 		[objIdentifier]
-2. dri:repositoryId			X
-3. dri:dateOfCollection		X
--->
-<xsl:template match = "header">
-	<field name="datasourceId" multiplicity="false" indexId="objIdentifier" label="Object id">
-		<xsl:attribute name="value">
-			<xsl:value-of select='./dri:objIdentifier'/>
-		</xsl:attribute>
-	</field>
-	<!--<field name="repositoryId" multiplicity="false" indexId="???" label="???">
-		<xsl:attribute name="value">
-			<xsl:value-of select='./dri:repositoryId'/>
-		</xsl:attribute>
-	</field>-->
-	<!--<field name="dateOfCollection" multiplicity="false" indexId="???" label="???">
-		<xsl:attribute name="value">
-			<xsl:value-of select='./dri:dateOfCollection'/>
-		</xsl:attribute>
-	</field>-->
-</xsl:template>
-
-
-<xsl:template match = "oaf:datasource">
-    <xsl:for-each select = "./originalId">
-        <field name="originalId" indexId = "" multiplicity="false" label="Original id">
-            <xsl:attribute name="value">
-                <xsl:value-of select='.'/>
-            </xsl:attribute>
-        </field>
-    </xsl:for-each>
-
-	<xsl:for-each select = "./officialname">		
-		<field name="officialname" indexId = "datasourceofficialname" multiplicity="true" label="Official name">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./englishname">
-		<field name="englishname" indexId = "datasourceenglishname" multiplicity="true" label="English name">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./websiteurl">
-		<field name="websiteurl" indexId = "datasourcewebsiteurl" multiplicity="true" label="Website url">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./logourl">
-		<field name="logourl" indexId = "datasourcelogourl" multiplicity="true" label="Logo url">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./contactemail">
-		<field name="contactemail" indexId = "datasourcecontactemail" multiplicity="true" label="Contact e-mail">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-	
-	<xsl:for-each select = "./oddescription">
-		<field name="oddescription" indexId = "datasourceoddescription" multiplicity="true" label="Description">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-	
-	<xsl:for-each select = "./odnumberofitems">
-		<field name="odnumberofitems" indexId = "datasourceodnumberofitems" multiplicity="true" label="number of items">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-	
-	<xsl:for-each select = "./odnumberofitemsdate">
-		<field name="odnumberofitemsdate" indexId = "datasourceodnumberofitemsdate" multiplicity="true" label="date">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-	
-	<xsl:for-each select = "./odsubjects">
-		<field name="odsubjects" indexId = "datasourceodsubjects" multiplicity="true" label="Subjects">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>	
-	
-	<xsl:for-each select = "./odlanguages">
-		<field name="odlanguages" indexId = "datasourceodlanguages" multiplicity="true" label="Languages">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>	
-
-	<xsl:for-each select = "./odcontenttypes">
-		<field name="odcontenttypes" indexId = "datasourceodcontenttypes" multiplicity="true" label="Content">
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>	
-
-	<xsl:for-each select = "./datasourcetype">
-		<field name="datasourcetypeid" indexId = "datasourcetypeid" multiplicity="true" label="Datasource type"> 
-			<xsl:attribute name="value">
-				<xsl:value-of select='./@classid'/>
-			</xsl:attribute>
-		</field>
-	
-		<field name="datasourcetypename" indexId = "datasourcetypename" multiplicity="true" label="Datasource type"> 
-			<xsl:attribute name="value">
-				<xsl:value-of select='./@classname'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-	
-	<xsl:for-each select = "./datasourcetypeui">
-		<field name="datasourcetypeuiid" indexId = "datasourcetypeui" multiplicity="true" label="Datasource type"> 
-			<xsl:attribute name="value">
-				<xsl:value-of select='./@classid'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./openairecompatibility">
-		<field name="openairecompatibilityid" indexId = "datasourcecompatibilityid" multiplicity="true" label="openaire compatibility"> 
-			<xsl:attribute name="value">
-				<xsl:value-of select='./@classid'/>
-			</xsl:attribute>
-		</field>
-
-		<field name="openairecompatibilityname" indexId = "datasourcecompatibilityname" multiplicity="true" label="openaire compatibility"> 
-			<xsl:attribute name="value">
-				<xsl:value-of select='./@classname'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-	
-	<xsl:for-each select = "./accessinfopackage">
-		<field name="accessinfopackage" indexId = "" multiplicity="true" label="OAI-PMH"> 
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-	
-	<xsl:for-each select = "./namespaceprefix">
-		<field name="namespaceprefix" indexId = "" multiplicity="true" label="namespace prefix"> 
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>	
-
-	<xsl:for-each select = "./odpolicies">
-		<field name="odpolicies" indexId = "" multiplicity="true" label="Policies"> 
-			<xsl:attribute name="value">
-				<xsl:value-of select='.'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-	
-	<xsl:for-each select = "./pid">
-		<field name="pidid" indexId = "pidclassid" multiplicity="true" label="Pid">
-			<xsl:attribute name="value">
-				<xsl:value-of select='./@classid'/>
-			</xsl:attribute>
-		</field>
-		<field name="pidname" indexId = "pidclassname" multiplicity="true" label="Pid">
-			<xsl:attribute name="value">
-				<xsl:value-of select='./@classname'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-
-	<xsl:for-each select = "./aggregatortype">
-		<field name="aggregatortypeid" indexId = "" multiplicity="true" label="Pid">
-			<xsl:attribute name="value">
-				<xsl:value-of select='./@classid'/>
-			</xsl:attribute>
-		</field>
-		<field name="aggregatortypename" indexId = "" multiplicity="true" label="Pid">
-			<xsl:attribute name="value">
-				<xsl:value-of select='./@classname'/>
-			</xsl:attribute>
-		</field>
-	</xsl:for-each>
-
-	<field name="latitude" indexId="" multiplicity="false" label="latitutde">
-		<xsl:attribute name="value">
-				<xsl:value-of select='./latitude'/>
-			</xsl:attribute>
-	</field>
-
-	<field name="longitude" indexId="" multiplicity="false" label="longitude">
-		<xsl:attribute name="value">
-				<xsl:value-of select='./longitude'/>
-			</xsl:attribute>
-	</field>	
-
-	<field name="dateofcollection" indexId="" multiplicity="false" label="date of collection">
-		<xsl:attribute name="value">
-				<xsl:value-of select='./dateofcollection'/>
-			</xsl:attribute>
-	</field>
-
-</xsl:template>
-
-<!--  RELS  
-1. person
-2. project
-3. organisation 
-4. result  
-5. datasource TODO
--->
-<xsl:template match="rel">
-<!--PERSON-->
-	<xsl:if test="./to/@type='person'">
-		<field name="author" indexId = "objIdentifier"  multiplicity="true">
-			<xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-			<field name = "personId" indexId ="objIdentifier" multiplicity="false" label="Person id">		
-				<xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-			</field>
-			<field name = "role" indexId ="" multiplicity="false" label="role">		
-				<xsl:attribute name="value"><xsl:value-of select='./to/@class'/> </xsl:attribute>
-			</field>
-			<field name = "fullname" indexId ="personfullname" multiplicity="false" label="Person fullname">		
-				<xsl:attribute name="value"><xsl:value-of select='./fullname'/> </xsl:attribute>
-			</field>
-			<field name = "ranking" indexId ="" multiplicity="false" label="ranking">		
-				<xsl:attribute name="value"><xsl:value-of select='./ranking'/> </xsl:attribute>
-			</field>
-		</field>
-	</xsl:if>
-<!--PROJECT-->
-	<xsl:if test="./to/@type='project'">	
-		<field name="project" indexId = "objIdentifier" multiplicity="true">
-			<xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-			<field name = "projectId" indexId ="objIdentifier" multiplicity="false" label="Project id">		
-				<xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-			</field>
-			<field name = "role" indexId ="" multiplicity="false" label="role">		
-				<xsl:attribute name="value"><xsl:value-of select='./to/@class'/> </xsl:attribute>
-			</field>
-			<field name = "projectcode" indexId ="projectcode" multiplicity="false" label="Project(s)">		
-				<xsl:attribute name="value"><xsl:value-of select='./code'/> </xsl:attribute>
-			</field>	
-			<field name = "projectacronym" indexId ="projectacronym" multiplicity="false" label="Project(s)">		
-				<xsl:attribute name="value"><xsl:value-of select='./acronym'/> </xsl:attribute>
-			</field>
-			<field name = "projecttitle" indexId ="projecttitle" multiplicity="false" label="Project title">		
-				<xsl:attribute name="value"><xsl:value-of select='./title'/> </xsl:attribute>
-			</field>
-			<field name = "projectcontracttypeid" indexId ="projectcontracttypeid" multiplicity="false" label="Project contract type id">		
-				<xsl:attribute name="value"><xsl:value-of select='./contracttype/@classid'/> </xsl:attribute>
-			</field>
-			<field name = "projectcontracttypename" indexId ="projectcontracttypename" multiplicity="false" label="Project contract type name">		
-				<xsl:attribute name="value"><xsl:value-of select='./contracttype/@classname'/> </xsl:attribute>
-			</field>
-		</field>
-	</xsl:if>
-<!--RESULT-->
-	<xsl:if test="./to/@type='result'">
-		<field name="result" indexId = "objIdentifier"  multiplicity="true">
-			<xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-			<field name = "resultid" indexId ="objIdentifier" multiplicity="false" label="Result id">		
-				<xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-			</field>
-			<field name = "title" indexId = "resulttitle" multiplicity = "false" label = "Title">
-				<xsl:attribute name="value">
-					<xsl:value-of select="./title"/>
-				</xsl:attribute>
-			</field>
-			<field name = "dateofacceptance" indexId = "resultdateofacceptance" multiplicity = "false" label = "Date of acceptance">
-				<xsl:attribute name="value">
-					<xsl:value-of select="./dateofacceptance"/>
-				</xsl:attribute>
-			</field>
-			<field name = "resulttypeid" indexId = "resulttypeid" multiplicity = "false" label = "type id">
-				<xsl:attribute name="value">
-					<xsl:value-of select="./resulttype/@classid"/>
-				</xsl:attribute>
-			</field>
-			<field name = "resulttypename" indexId = "resulttypename" multiplicity = "false" label = "type name">
-				<xsl:attribute name="value">
-					<xsl:value-of select="./resulttype/@classname"/>
-				</xsl:attribute>
-			</field>
-		</field>
-	</xsl:if>	
-<!--ORGANIZATION-->
-	<xsl:if test="./to/@type='organization'">
-		<field name="organization" indexId = "objIdentifier"  multiplicity="true">
-			<xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-			<field name = "organizationid" indexId ="objIdentifier" multiplicity="false" label="Organization id">		
-				<xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-			</field>
-			<field name = "role" indexId ="" multiplicity="false" label="role">		
-				<xsl:attribute name="value"><xsl:value-of select='./to/@class'/> </xsl:attribute>
-			</field>
-			<field name = "legalshortname" indexId ="organizationlegalshortname" multiplicity="false" label="Organization short name">		
-				<xsl:attribute name="value"><xsl:value-of select='./legalshortname'/> </xsl:attribute>
-			</field>
-			<field name = "legalname" indexId ="organizationlegalname" multiplicity="false" label="Organization name">		
-				<xsl:attribute name="value"><xsl:value-of select='./legalname'/> </xsl:attribute>
-			</field>
-			<field name = "websiteurl" indexId ="organizationwebsiteurl" multiplicity="false" label="Website">		
-				<xsl:attribute name="value"><xsl:value-of select='./websiteurl'/> </xsl:attribute>
-			</field>
-			<field name = "countryid" indexId ="organizationcountryid" multiplicity="false" label="Country code">		
-				<xsl:attribute name="value"><xsl:value-of select='./country/@classid'/> </xsl:attribute>
-			</field>
-			<field name = "countryname" indexId ="organizationcountryname" multiplicity="false" label="Country">		
-				<xsl:attribute name="value"><xsl:value-of select='./country/@classname'/> </xsl:attribute>
-			</field>
-			<field name = "participantnumber" indexId ="" multiplicity="false" label="Participant Number">		
-				<xsl:attribute name="value"><xsl:value-of select='./participantnumber'/> </xsl:attribute>
-			</field>
-			<field name = "contactperson" indexId ="" multiplicity="false" label="Contact Person">		
-				<xsl:attribute name="value"><xsl:value-of select='./contactperson'/> </xsl:attribute>
-			</field>
-		</field>
-	</xsl:if>
-
-</xsl:template>
-
-</xsl:stylesheet>
-
-
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/funding_level0.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/funding_level0.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/funding_level0.xml	(nonexistent)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value=""/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2008-06-25T14:50:49+02:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Funding Level 0</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>Funding Level 0 descriptions</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM code="corda_______::FP7" english_name="EC>FP7" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::H2020" english_name="EC>H2020" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-06-25T14:50:49+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/html_publication.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/html_publication.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/html_publication.xsl	(nonexistent)
@@ -1,102 +0,0 @@
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:dri="http://www.driver-repository.eu/namespace/dri"
-                xmlns:oaf="http://namespace.openaire.eu/oaf"
-                xmlns:dc="http://purl.org/dc/elements/1.1/">
-
-    <!-- Turn off auto-insertion of <?xml> tag and set indenting on -->
-    <xsl:output method="html" encoding="utf-8" omit-xml-declaration="yes" media-type="text/html" />
-
-    <!-- strip whitespace from whitespace-only nodes -->
-    <xsl:strip-space elements="*"/>
-
-    <xsl:template match = "/">
-        <xsl:apply-templates select="//oaf:result"/>
-    </xsl:template>
-
-    <!-- Title, Authors, Publication Year, DOI, Download From, Publication Type, Journal, Funder, Project Name (GA Number), Access -->
-
-    <xsl:template match="oaf:result">
-        <tr>
-            <!-- Title -->
-            <td>
-                <xsl:value-of select="title"/>
-            </td>
-
-            <!-- Authors -->
-            <td>
-                <xsl:for-each select="creator">
-                    <xsl:sort select="@rank"/>
-                    <xsl:value-of select="."/>
-                    <xsl:if test="not(position()=last())">
-                        <xsl:text>;</xsl:text>
-                    </xsl:if>
-                </xsl:for-each>
-            </td>
-
-            <!-- Publication Year -->
-            <td>
-                <xsl:value-of select="dateofacceptance"/>
-            </td>
-
-            <!-- DOI -->
-            <td>
-                <xsl:apply-templates select="pid"/>
-            </td>
-
-            <!-- Download from -->
-            <td>
-                <a target="_blank">
-                    <xsl:attribute name="href">
-                        <xsl:value-of select="children/instance[1]/webresource[1]"/>
-                    </xsl:attribute>
-                    <xsl:value-of select="children/instance[1]/webresource[1]"/>
-                </a>
-            </td>
-
-            <!-- Publication Type -->
-            <td>
-                <xsl:value-of select="children/instance[1]/instancetype/@classname"/>
-            </td>
-
-            <!-- Journal -->
-            <td>
-                <xsl:value-of select="replace(source, '[&#x007F;-&#x009F;]', ' ')"/>
-            </td>
-
-            <!-- Funder|Project Name (GA Number) -->
-            <td>
-                <xsl:for-each select="rels/rel/to[@class='isProducedBy']">
-                    <xsl:value-of select="../funding/funder/@shortname"/>
-                    <xsl:text>|</xsl:text>
-                    <xsl:choose>
-                        <xsl:when test="../acronym">
-                            <xsl:value-of select="../acronym"/>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:text>"</xsl:text>
-                            <xsl:value-of select="../title"/>
-                            <xsl:text>"</xsl:text>
-                        </xsl:otherwise>
-                    </xsl:choose>
-                    <xsl:text>(</xsl:text>
-                    <xsl:value-of select="../code"/>
-                    <xsl:text>)</xsl:text>
-                    <xsl:if test="not(position()=last())">
-                        <xsl:text>;</xsl:text>
-                    </xsl:if>
-                </xsl:for-each>
-            </td>
-
-            <!-- Access -->
-            <td>
-                <xsl:value-of select="bestaccessright/@classname"/>
-            </td>
-        </tr>
-    </xsl:template>
-
-    <xsl:template match="pid[@classid='doi']">
-        <xsl:value-of select="."/>
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/funders.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/funders.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/funders.xml	(nonexistent)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value=""/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2008-06-25T14:50:49+02:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Funder</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>Funder descriptions</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM code="ec__________::EC" english_name="European Commission (EC)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="arc_________::ARC" english_name="Australian Research Council (ARC)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ands________::NHMRC" english_name="National Health and Medical Research Council (NHMRC)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="fct_________::FCT" english_name="Fundação para a Ciência e a Tecnologia, I.P. (FCT)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="wt__________::WT" english_name="Wellcome Trust (WT)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-06-25T14:50:49+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/accessmode.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/accessmode.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/accessmode.xml	(nonexistent)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value=""/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2008-06-25T14:50:49+02:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Access Modes</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>OpenAIRE access modes descriptions</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM code="OPEN" english_name="Open Access" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="CLOSED" english_name="Closed Access" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="EMBARGO" english_name="Embargo Access" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="RESTRICTED" english_name="Restricted Access" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="UNKNOWN" english_name="Unknown" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-06-25T14:50:49+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
-
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/configuration.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/configuration.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/configuration.xml	(nonexistent)
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-	<locales>
-		<locale name="en_GB" default="true" />
-
-	</locales>
-
-	<vocabularies>
-		<is_vocabulary name="languages" xml_name="dnet:languages" />
-		<is_vocabulary name="countries" xml_name="dnet:countries" />
-		<is_vocabulary name="documenttype" xml_name="dnet:publication_resource" />
-		<is_vocabulary name="compatibility" xml_name="dnet:datasourceCompatibilityLevel" />
-		<is_vocabulary name="taxonomy" xml_name="dnet:subject_classification_typologies" />
-		<is_vocabulary name="datasource_type" xml_name="dnet:datasource_typologies" />
-		<local_vocabulary name="funders" file="funders.xml" />
-		<local_vocabulary name="funding_level0" file="funding_level0.xml" />
-		<local_vocabulary name="funders_simple" file="funders_simple.xml" />
-		<local_vocabulary name="sygma_funders" file="sygma_funders.xml" />
-		<local_vocabulary name="areas" file="areas.xml" />
-		<local_vocabulary name="programmes_simple" file="programmes_simple.xml" />
-		<local_vocabulary name="programmes" file="programmes.xml" />
-		<local_vocabulary name="accessModes" file="accessmode.xml" />
-		<local_vocabulary name="datasource_type" file="datasource_type.xml" />
-		<local_vocabulary name="project_funders" file="project_funders.xml" />
-		<local_vocabulary name="sc39" file="sc39.xml" />
-		<local_vocabulary name="community" file="community.xml"/>
-	</vocabularies>
-
-	<transformers>
-
-		<transformer name="results_openaire">
-			<transformation xslt="result.xsl" />
-			<transformation match="language" change="value" vocabulary="languages" />
-			<transformation match="funding.funding_level_0" change="value" vocabulary="funders" />
-			<transformation match="funding.funding_level_1" change="value" vocabulary="programmes" />
-			<transformation match="funding.funding_level_2" change="value" vocabulary="areas" />
-			<transformation match="datasource.hostedby" change="value" vocabulary="datasources" />
-			<transformation match="datasource.licenceid" change="value" vocabulary="accessModes" />
-		</transformer>
-
-		<transformer name="projects_openaire">
-			<transformation xslt="project.xsl" />
-		</transformer>
-
-		<transformer name="datasources_openaire">
-			<transformation xslt="datasource.xsl" />
-			<transformation match="openairecompatibilityid" change="value" vocabulary="compatibility"/>
-			<transformation match="datasourcetypeuiid" change="value" vocabulary="datasource_type"/>
-		</transformer>
-
-		<!-- valid for every browse result of every entity type -->
-		<transformer name="results_openaire_browse">
-			<transformation xslt="browse.xsl" />
-
-			<transformation match="resultlanguageid.value" change="value" vocabulary="languages" />
-			<transformation match="organizationcountryid.value" change="value" vocabulary="countries" />
-			<transformation match="instancetypenameid.value" change="value" vocabulary="documenttype" />
-
-			<transformation match="relfunderid.value" change="value" vocabulary="funders" />
-			<transformation match="funderid.value" change="value" vocabulary="funders" />
-
-			<transformation match="relfundinglevel0_id.value" change="value" vocabulary="funding_level0" />
-			<transformation match="relfundinglevel1_id.value" change="value" vocabulary="programmes" />
-			<transformation match="relfundinglevel2_id.value" change="value" vocabulary="areas" />
-
-			<transformation match="fundinglevel0_id.value" change="value" vocabulary="funding_level0" />
-			<transformation match="fundinglevel1_id.value" change="value" vocabulary="programmes" />
-			<transformation match="fundinglevel2_id.value" change="value" vocabulary="areas" />
-
-			<transformation match="communityid.value" change="value" vocabulary="community"/>
-
-			<transformation match="collectedfromdatasourceid.value" change="value" vocabulary="datasources" />
-			<transformation match="resulthostingdatasourceid.value" change="value" vocabulary="datasources" />
-			<transformation match="resultcollectedfromdatasourceid.value" change="value" vocabulary="datasources" />
-
-			<transformation match="datasourcecompatibilityid.value" change="value" vocabulary="compatibility"/>
-
-			<transformation match="resultrightsid.value" change="value" vocabulary="accessModes" />
-			<!--<transformation match="relprojectid.value" change="value" vocabulary="projects" />-->
-			<transformation match="projectecsc39.value" change="value" vocabulary="sc39" />
-			<transformation match="datasourcetypeuiid.value" change="value" vocabulary="datasource_type" />
-		</transformer>
-
-		<transformer name="organizations_openaire">
-			<transformation xslt="organization.xsl" />
-		</transformer>
-
-		<transformer name="dc">
-			<transformation xslt="dc.xsl" />
-		</transformer>
-
-		<transformer name="csv_organization">
-			<transformation xslt="csv_organization.xsl" />
-		</transformer>
-
-		<transformer name="csv_datasource">
-			<transformation xslt="csv_datasource.xsl" />
-		</transformer>
-
-		<transformer name="csv_project">
-			<transformation xslt="csv_project.xsl" />
-		</transformer>
-
-		<transformer name="csv_publication">
-			<transformation xslt="csv_publication.xsl" />
-		</transformer>
-
-		<transformer name="html_publication">
-			<transformation xslt="html_publication.xsl" />
-		</transformer>
-
-		<transformer name="csv-special_publication">
-			<transformation xslt="csv_publication_special.xsl" />
-		</transformer>
-
-		<transformer name="csv_dataset">
-			<transformation xslt="csv_publication.xsl" />
-		</transformer>
-
-		<transformer name="csv-special_dataset">
-			<transformation xslt="csv_publication_special.xsl" />
-		</transformer>
-
-		<transformer name="html_dataset">
-			<transformation xslt="html_publication.xsl" />
-		</transformer>
-
-		<transformer name="csv_software">
-			<transformation xslt="csv_publication.xsl" />
-		</transformer>
-
-		<transformer name="csv-special_software">
-			<transformation xslt="csv_publication_special.xsl" />
-		</transformer>
-
-		<transformer name="html_software">
-			<transformation xslt="html_publication.xsl" />
-		</transformer>
-
-		<transformer name="csv_other">
-			<transformation xslt="csv_publication.xsl" />
-		</transformer>
-
-		<transformer name="csv-special_other">
-			<transformation xslt="csv_publication_special.xsl" />
-		</transformer>
-
-		<transformer name="html_other">
-			<transformation xslt="html_publication.xsl" />
-		</transformer>
-
-	</transformers>
-
-	<formatters>
-		<formatter name="json" xslt="json.xsl"/>
-		<formatter name="xml" xslt="simple.xsl"/>
-		<formatter name="rss" xslt="rss.xsl" />
-		<formatter name="csv" xslt="csv.xsl" />
-		<formatter name="tsv" xslt="tsv.xsl" />
-		<formatter name="project_csv" xslt="project_csv.xsl" />
-		<formatter name="project_tsv" xslt="project_tsv.xsl" />
-		<formatter name="publication_csv_notitle" xslt="publication_csv_notitle.xsl" />
-		<formatter name="publication_tsv_notitle" xslt="publication_tsv_notitle.xsl" />
-		<formatter name="project_html" xslt="project_html.xsl" />
-		<formatter name="html" xslt="html.xsl" />
-		<formatter name="sygma_publication" xslt="sygma.xsl"/>
-		<formatter name="sygma_dataset" xslt="sygma_dataset.xsl"/>
-		<formatter name="vocabulary" xslt="vocabulary.xsl"/>
-
-	</formatters>
-</configuration>
-
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/browse.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/browse.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/browse.xsl	(nonexistent)
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:output method="xml" indent="yes" encoding="UTF-8"/>
-    <xsl:template match="/">
-        <result>
-            <xsl:apply-templates select="row/groupresult"/>
-        </result>
-    </xsl:template>
-
-
-    <xsl:template match="groupresult">
-        <field>
-            <xsl:attribute name='name'>
-                <xsl:value-of select='./@field'/>
-            </xsl:attribute>
-            <xsl:attribute name='indexId'>
-                <xsl:value-of select='./@field'/>
-            </xsl:attribute>
-            <field name="count">
-                <xsl:attribute name="value">
-                    <xsl:value-of select="./count"/>
-                </xsl:attribute>
-            </field>
-            <field name="value">
-                <xsl:choose>
-                    <xsl:when test="./@field='funderid' or ./@field='fundinglevel0_id' or ./@field='fundinglevel1_id' or ./@field='fundinglevel2_id' or ./@field='relfunderid' or ./@field='relfundinglevel0_id' or ./@field='relfundinglevel1_id' or ./@field='relfundinglevel2_id'">
-                        <xsl:attribute name="value">
-                            <xsl:call-template name="getExtension">
-						<xsl:with-param name="filename" select="./value"/>
-                            </xsl:call-template>
-                        </xsl:attribute>
-                        <xsl:attribute name="value_original">
-                            <xsl:value-of select="./value"/>
-                        </xsl:attribute>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:attribute name="value">
-                            <xsl:value-of select="./value"/>
-                        </xsl:attribute>
-                        <xsl:attribute name="value_original">
-                            <xsl:value-of select="./originalValue"/>
-                        </xsl:attribute>
-                    </xsl:otherwise>
-                </xsl:choose>
-            </field>
-        </field>
-    </xsl:template>
-
-    <xsl:template match="node() | @*"></xsl:template>
-
-    <xsl:template name="getExtension">
-        <xsl:param name="filename"/>
-        <xsl:choose>
-            <xsl:when test="contains($filename, '_::')">
-                <xsl:call-template name="getExtension">
-                    <xsl:with-param name="filename" select="substring-after($filename, '_::')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of select="$filename"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-
-</xsl:stylesheet>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/project_tsv.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/project_tsv.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/project_tsv.xsl	(nonexistent)
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:dri="http://www.driver-repository.eu/namespace/dri"
-                xmlns:oaf="http://namespace.openaire.eu/oaf"
-                xmlns:dc="http://purl.org/dc/elements/1.1/">
-
-    <!-- Turn off auto-insertion of <?xml> tag and set indenting on -->
-    <xsl:output method="text" encoding="utf-8" omit-xml-declaration="yes" media-type="text/csv" />
-
-    <!-- strip whitespace from whitespace-only nodes -->
-    <xsl:strip-space elements="*"/>
-
-    <xsl:template match = "/">
-        <xsl:text disable-output-escaping="yes">Project title&#x9;Project Acronym&#x9;Project ID&#x9;Funder&#x9;Funding Stream&#x9;Funding Substream level 1&#x9;Funding Substream level 2&#x9;SC39&#x9;Start Date&#x9;End Date&#xD;</xsl:text>
-        <xsl:apply-templates select="//oaf:project"/>
-    </xsl:template>
-
-    <!-- Project title, Project Acronym, Project ID, Funder, Funding Stream, Funding Substream level 1, Funding Substream level 2, SC39, Start Date, End Date -->
-    <xsl:template match="//oaf:project">
-
-        <xsl:for-each select="fundingtree">
-            <!-- Project title -->
-            <xsl:text>&quot;</xsl:text>
-            <xsl:value-of select="../title"/>
-            <xsl:text>&quot;</xsl:text>
-            <xsl:text>&#x9;</xsl:text>
-
-            <!-- Project Acronym -->
-            <xsl:text>&quot;</xsl:text>
-            <xsl:value-of select="../acronym"/>
-            <xsl:text>&quot;</xsl:text>
-            <xsl:text>&#x9;</xsl:text>
-
-            <!-- Project ID -->
-            <xsl:text>&quot;</xsl:text>
-            <xsl:value-of select="../code"/>
-            <xsl:text>&quot;</xsl:text>
-            <xsl:text>&#x9;</xsl:text>
-
-            <!-- Funder -->
-<!--
-            <xsl:for-each select="funder">
--->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:value-of select="funder/shortname"/>
-                <xsl:text>&quot;</xsl:text>
-<!--
-            </xsl:for-each>
--->
-            <xsl:text>&#x9;</xsl:text>
-
-            <!-- Funding Stream-->
-<!--
-            <xsl:for-each select="funding_level_2/parent/funding_level_1/parent/funding_level_0">
--->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:value-of select=".//funding_level_0/name"/>
-                <xsl:text>&quot;</xsl:text>
-<!--
-            </xsl:for-each>
--->
-            <xsl:text>&#x9;</xsl:text>
-
-            <!-- Funding Substream Level 1 -->
-<!--
-            <xsl:for-each select="funding_level_2/parent/funding_level_1">
--->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:value-of select=".//funding_level_1/name"/>
-                <xsl:text>&quot;</xsl:text>
-<!--
-            </xsl:for-each>
--->
-            <xsl:text>&#x9;</xsl:text>
-
-            <!-- Funding Substream Level 2 -->
-<!--
-            <xsl:for-each select="funding_level_2">
--->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:value-of select=".//funding_level_2/name"/>
-                <xsl:text>&quot;</xsl:text>
-            <!--</xsl:for-each>-->
-            <xsl:text>&#x9;</xsl:text>
-
-            <!-- SC39 -->
-            <xsl:text>&quot;</xsl:text>
-            <xsl:value-of select="../ecsc39"/>
-            <xsl:text>&quot;</xsl:text>
-            <xsl:text>&#x9;</xsl:text>
-
-            <!-- Start Date -->
-            <xsl:text>&quot;</xsl:text>
-            <xsl:value-of select="../startdate"/>
-            <xsl:text>&quot;</xsl:text>
-            <xsl:text>&#x9;</xsl:text>
-
-            <!-- End Date -->
-            <xsl:text>&quot;</xsl:text>
-            <xsl:value-of select="../enddate"/>
-            <xsl:text>&quot;</xsl:text>
-            <xsl:text>&#xD;</xsl:text>
-
-        </xsl:for-each>
-
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/compatibility.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/compatibility.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/compatibility.xml	(nonexistent)
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value=""/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2008-06-25T14:50:49+02:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Compatibility</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>OpenAIRE compatibility descriptions</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM code="UNKNOWN" english_name="not available" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="driver" native_name="" english_name="OpenAIRE basic (DRIVER OA)">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="driver-openaire2.0" native_name="" english_name="OpenAIRE 2.0+ (DRIVER OA, EC funding)">
-                    <SYNONYMS/>
-                </TERM>
-		        <TERM code="notCompatible" native_name="" english_name="under validation">
-                    <SYNONYMS/>
-                </TERM>          
-		        <TERM code="openaire2.0" native_name="" english_name="OpenAIRE 2.0 (EC funding)">
-                    <SYNONYMS/>
-                </TERM>          
-		        <TERM code="openaire3.0" native_name="" english_name="OpenAIRE 3.0 (OA, funding)">
-                    <SYNONYMS/>
-                </TERM>          
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-06-25T14:50:49+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/html.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/html.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/html.xsl	(nonexistent)
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-    <!-- Turn off auto-insertion of <?xml> tag and set indenting on -->
-    <xsl:output method="html" encoding="utf-8" omit-xml-declaration="yes" />
-
-    <!-- strip whitespace from whitespace-only nodes -->
-    <xsl:strip-space elements="*"/>
-
-    <xsl:template match = "/">
-        <table>
-            <thead>
-                <tr>
-                    <th>Title</th>
-                    <th>Authors</th>
-                    <th>Publication Year</th>
-                    <th>DOI</th>
-                    <th>Permanent Identifier</th>
-                    <th>Publication type</th>
-                    <th>Journal</th>
-                    <th>Project Name (GA Number)</th>
-                    <th>Access Mode</th>
-                </tr>
-            </thead>
-            <tbody>
-                <xsl:apply-templates select="//result"/>
-            </tbody>
-        </table>
-    </xsl:template>
-
-    <!-- Title, Authors, Description, Year, DOI, Permanent identifier, Publication type, Journal, Project Name, GA number, Access -->
-    <xsl:template match="result">
-        <tr>
-            <!-- title -->
-            <td>
-                <xsl:value-of select="replace(field[@name='title']/@value, '[&#x007F;-&#x009F;]', ' ')"/>
-            </td>
-
-            <!-- authors -->
-            <td>
-                <xsl:for-each select="field[@name='hasAuthor']">
-                    <xsl:sort select="field[@name='ranking']/@value" data-type="number"/>
-                    <xsl:value-of select="replace(field[@name='fullname']/@value, '[&#x007F;-&#x009F;]', ' ')"/>
-                    <xsl:if test="not(position()=last())">
-                        <xsl:text>; </xsl:text>
-                    </xsl:if>
-                </xsl:for-each>
-            </td>
-
-            <!-- description
-            <xsl:text>&quot;</xsl:text>
-                <xsl:value-of select="field[@name='description']/@value"/>
-                <xsl:if test="position() != last()"><xsl:text>&#160;</xsl:text></xsl:if>
-            <xsl:text>&quot;</xsl:text>
-            <xsl:text>,</xsl:text>
-    -->
-            <!-- year -->
-            <td>
-                <xsl:value-of select="field[@name='dateofacceptance']/@value"/>
-            </td>
-
-            <!-- DOI -->
-            <td>
-                <xsl:for-each select="field[@name='pid']">
-                    <xsl:if test="field[@name='classid' and @value='doi']/@value = 'doi'">
-                        <xsl:value-of select="replace(field[@name='value']/@value, '[&#x007F;-&#x009F;]', ' ')"/>
-                    </xsl:if>
-                </xsl:for-each>
-            </td>
-
-            <!-- Permanent Identifier -->
-            <td>
-                <a target="_blank">
-                    <xsl:attribute name="href">
-                        <xsl:value-of select="replace(field[@name='datasource'][1]/field[@name='url']/@value, '[&#x007F;-&#x009F;]', ' ')"/>
-                    </xsl:attribute>
-                    <xsl:value-of select="field[@name='datasource'][1]/field[@name='url']/@value"/>
-                </a>
-            </td>
-
-            <!-- Publication type -->
-            <td>
-                <xsl:value-of select="field[@name='datasource'][1]/field[@name='typename']/@value"/>
-            </td>
-
-            <!-- journal -->
-            <td>
-                <xsl:for-each select="field[@name='source']">
-                    <xsl:value-of select="replace(@value, '[&#x007F;-&#x009F;]', ' ')"/>
-                </xsl:for-each>
-            </td>
-
-            <!-- project name -->
-            <td>
-                <xsl:for-each select="field[@name='project'] ">
-                    <!-- project name -->
-                    <xsl:choose>
-                        <xsl:when test="field[@name='projectacronym']/@value != ''" >
-                            <xsl:value-of select="replace(field[@name='projectacronym']/@value, '[&#x007F;-&#x009F;]', ' ')"/>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:value-of select="replace(field[@name='projecttitle']/@value, '[&#x007F;-&#x009F;]', ' ')"/>
-                        </xsl:otherwise>
-                    </xsl:choose>
-                    <xsl:if test="field[@name='projectcode']/@value!= ''">
-                        <xsl:value-of select="concat('(',field[@name='projectcode']/@value,')')"/>
-                    </xsl:if>
-                    <xsl:if test="not(position()=last())">
-                        <xsl:text>; </xsl:text>
-                    </xsl:if>
-                </xsl:for-each>
-            </td>
-
-            <!--access -->
-            <td>
-                <xsl:value-of select="field[@name='bestaccessright']/@value"/>
-            </td>
-       </tr>
-
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/springContext-searchService.properties
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/springContext-searchService.properties	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/springContext-searchService.properties	(nonexistent)
@@ -1,17 +0,0 @@
-# service identity
-services.search.serviceName = uoa-search
-
-services.search.cacheBrowseData = false
-services.search.mdFormat = DMF
-services.search.indexLayout = index
-
-#working directory for search service to store vocabularies
-#services.search.vocabulariesPath = not/valid/path
-
-services.search.configurationPath = classpath:/configuration.xml
-
-services.search.maxResults = 10000
-services.search.maxSize = 10000
-
-services.search.infrastructure = shadow
-services.registration.default.removeRegistration = false
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/springContext-searchService.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/springContext-searchService.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/springContext-searchService.xml	(nonexistent)
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:context="http://www.springframework.org/schema/context"
-	   xmlns:cxf="http://cxf.apache.org/core"
-	   xmlns:jaxws="http://cxf.apache.org/jaxws"
-	   xmlns:p="http://http://www.springframework.org/schema/p"
-	   xmlns:template="http://dnetlib.eu/springbeans/template"
-	   xmlns:t="http://dnetlib.eu/springbeans/t"
-	   xmlns:util="http://www.springframework.org/schema/util"
-
-	   xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
-        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
-        http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
-        http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
-		http://dnetlib.eu/springbeans/template http://dnetlib.eu/springbeans/template.xsd
-		http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util-4.0.xsd"
-	   	default-autowire="byName">
-
-	<alias name="indexServiceLocator" alias="service.indexServiceLocator" />
-	<alias name="resultSetFactory" alias="service.resultSetFactory" />
-
-	<alias name="${services.search.indexMode}.indexServiceLocator"  alias="search.indexServiceLocator" />
-	<alias name="${services.search.indexMode}.resultSetFactory"  alias="search.resultSetFactory" />
-
-	<!-- query rewrite rules
-	<bean id="prefixRule" class="eu.dnetlib.data.search.app.plan.PrefixRule">
-		<property name="name" value="query prefix rule" />
-		<property name="prefix" value="(deletedbyinference=false)" />
-	</bean>-->
-
-	<!-- field rewrite rules -->
-	<bean id="collectionRule" class="eu.dnetlib.data.search.app.plan.CollectionRewriteRule">
-		<property name="name" value="collection expand rule" />
-		<property name="fieldName" value="collection" />
-		<property name="collectionLookUp" ref="collectionLookUp" />
-	</bean>
-
-	<util:list id="fieldQueryRules" value-type="java.lang.String">
-		<value>deletedbyinference=false</value>
-	</util:list>
-
-
-    <bean id="blackboardHandler" class="eu.dnetlib.enabling.tools.blackboard.BlackboardHandlerImpl">
-		<property name="serviceLocator" ref="cnr.uniqueServiceLocator" />
-        <property name="messageFactory">
-            <bean class="eu.dnetlib.miscutils.jaxb.JaxbFactory">
-                <constructor-arg value="eu.dnetlib.enabling.tools.blackboard.BlackboardMessageImpl" />
-            </bean>
-        </property>
-    </bean>
-	<bean id="searchServiceBlackboardHandler" class="eu.dnetlib.data.search.app.SearchServiceBlackboardHandler" lazy-init="true">
-		<property name="searchService" ref="searchService" />
-		<property name="lookUpServiceServiceLocator" ref="lookupServiceLocator" />
-		<property name="blackboardHandler" ref="blackboardHandler" />
-		<property name="registryServiceServiceLocator" ref="registryServiceLocator"/>
-	</bean>
-
-	<!--  the service bean -->
-	<bean id="searchService"
-		  class="eu.dnetlib.data.search.app.SearchServiceImpl"
-		  autowire="no">
-		<property name="snManager" ref="snManager" />
-		<property name="serviceIdentity">
-			<bean class="eu.dnetlib.utils.ServiceIdentityFactory"
-				  factory-method="createIdentity" >
-				<constructor-arg value="${services.search.serviceName}" />
-			</bean>
-		</property>
-		<property name="mdFormat" value="${services.search.mdFormat}" />
-		<property name="indexLayout" value="${services.search.indexLayout}" />
-		<property name="indexLocator" ref="search.indexServiceLocator" />
-		<property name="lookUpServiceServiceLocator" ref="lookupServiceLocator" />
-		<property name="rsFactory" ref="search.resultSetFactory" />
-		<property name="transformerFactory" ref="transformerFactory"/>
-		<property name="blackboardNotificationHandler" ref="searchServiceBlackboardHandler" />
-		<!--
-		<property name="queryRules">
-			<list>
-					<ref bean="prefixRule"/>
-			</list>
-		</property>
-		-->
-		<property name="fieldRules">
-			<list>
-				<ref bean="collectionRule" />
-			</list>
-		</property>
-		<property name="fieldQueryRules" ref="fieldQueryRules"/>
-	</bean>
-
-	<!-- The web service bean -->
-	<bean id="searchWebServiceImpl"
-		  class="eu.dnetlib.clients.data.search.ws.SearchWebServiceImpl">
-		<property name="service" ref="searchService" />
-	</bean>
-
-	<!-- Service endpoint -->
-	<jaxws:endpoint
-			id="searchWebService"
-			implementor="#searchWebServiceImpl"
-			implementorClass="eu.dnetlib.clients.data.search.ws.SearchWebService"
-			address="/searchWebService"/>
-
-	<template:instance name="nkua.serviceRegistrationManager"
-					   t:name="searchServiceRegistrationManager"
-					   t:service="searchService"
-					   t:endpoint="searchWebService"
-					   t:serviceRegistrator="searchServiceRegistrator"/>
-
-	<bean id="searchServiceRegistrator" parent="serviceRegistrator">
-		<property name="serviceProperties">
-			<map>
-				<entry key="infrastructure" value="${services.search.infrastructure}" />
-				<entry key="mdformat" value="${services.search.mdFormat}" />
-			</map>
-		</property>
-	</bean>
-
-	<bean id="searchServiceLocator"
-		  class="gr.uoa.di.driver.util.StaticServiceLocator">
-		<property name="service" ref="searchService" />
-	</bean>
-
-	<bean id="maxResults" class="java.lang.String">
-		<constructor-arg value="${services.search.maxResults}"/>
-	</bean>
-
-	<bean id="maxSize" class="java.lang.String">
-		<constructor-arg value="${services.search.maxSize}"/>
-	</bean>
-
-</beans>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/springContext-transformation.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/springContext-transformation.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/springContext-transformation.xml	(nonexistent)
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:cxf="http://cxf.apache.org/core" 
-	xmlns:jaxws="http://cxf.apache.org/jaxws"
-	xmlns:p="http://http://www.springframework.org/schema/p"
-	xmlns:template="http://dnetlib.eu/springbeans/template"
-	xmlns:t="http://dnetlib.eu/springbeans/t" 
-	
-	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
-        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
-        http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
-        http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
-	http://dnetlib.eu/springbeans/template http://dnetlib.eu/springbeans/template.xsd"
-	default-autowire="byName">
-
-	<!-- custom repository vocabulary loader -->
-	<bean id="repositoryVocabularyLoader" depends-on="resultSetFactory"
-		class="gr.uoa.di.driver.enabling.vocabulary.RepositoryVocabularyLoader">
-		<property name="datasourceManagerService" ref="datasourceManagerServiceLocator" />
-	</bean>
-
-	<!-- Load configuration for service -->
-	<bean id="configurationFactory" autowire="no" init-method="init"
-		class="eu.dnetlib.data.search.transform.config.ConfigurationFactory">
-		<property name="configurationName" value="${services.search.configurationPath}" />
-		<property name="vocabulariesPath" value="${services.search.vocabulariesPath}"/>
-	</bean>
-	
-	<bean id="configuration" factory-bean="configurationFactory" factory-method="createConfiguration">
-		<constructor-arg  value="config"/>
-	</bean>
-	
-	<bean id="indexVocabularyLoader" class="eu.dnetlib.data.search.utils.vocabulary.IndexVocabularyLoader">
-		<property name="searchServiceLocator" ref="searchServiceLocator"/>
-	</bean>
-	
-	<bean id="isVocabularyLoader" class="eu.dnetlib.data.search.utils.vocabulary.ISVocabularyLoader">
-		<property name="lookup" ref="vocabularyLookUp"></property>
-	</bean>
-	
-	<bean id="localVocabularyLoader" class="eu.dnetlib.data.search.utils.vocabulary.LocalVocabularyLoader"/>
-	
-	<bean id="vocabularyManager" class="eu.dnetlib.data.search.utils.vocabulary.VocabularyManagerImpl" 
-		autowire="no" init-method="init">
-		<property name="indexVocabularyLoader" ref="indexVocabularyLoader"/>
-		<property name="isVocabularyLoader" ref="isVocabularyLoader"/>
-		<property name="localVocabularyLoader" ref="localVocabularyLoader"/>
-		<property name="config" ref="configuration"/>
-	</bean>
-	
-	<bean id="vocabularyManagerWrapper" class="eu.dnetlib.data.search.utils.vocabulary.VocabularyManagerWrapper" >
-		<property name="vocabularyManager" ref="vocabularyManager"/>	
-	</bean>
-
-	<bean id="transformerFactory"
-		class="eu.dnetlib.data.search.transform.config.SearchRegistry">
-		<property name="config" ref="configuration"/>
-		<property name="vocabularyManager" ref="vocabularyManager"/>
-	</bean>
-
-</beans>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/formatter/bibtexConfig.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/formatter/bibtexConfig.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/formatter/bibtexConfig.xml	(nonexistent)
@@ -1,52 +0,0 @@
-<bibTexConfig name="resulttypeid">
-	<key xpath="substring-before(.//field[@indexId='personfullname']/@value,' ')"/>
-	<key xpath="substring-before(field[@indexId='resultdateofacceptance']/@value,'-')"/>
-	<key xpath="substring-before(field[@indexId='resulttitle']/@value,' ')"/>
-	<case value="result" bibTexType="article">
-		<term bibtexname="author" indexname="personfullname"/>
-		<term bibtexname="title" indexname="resulttitle"/>
-		<term bibtexname="journal" indexname="source"/>
-		<term bibtexname="year" indexname="resultdateofacceptance"/>
-	</case>
-	<case value="Book" bibTexType="book">
-		<term bibtexname="editor" indexname="relperson"/>
-		<term bibtexname="title" indexname="resulttitle"/>
-		<term bibtexname="publisher" indexname="resultpublisher"/>
-		<term bibtexname="year" indexname="resultdateofacceptance"/>
-	</case>
-	<case value="BookPart" bibTexType="incollection">
-		<term bibtexname="author" indexname="relperson"/>
-		<term bibtexname="title" indexname="resulttitle"/>
-		<term bibtexname="booktitle" indexname="source"/>
-		<term bibtexname="year" indexname="resultdateofacceptance"/>
-	</case>
-	<case value="ConferenceObject" bibTexType="inproceedings">
-		<term bibtexname="author" indexname="relperson"/>
-		<term bibtexname="title" indexname="resulttitle"/>
-		<term bibtexname="booktitle" indexname="source"/>
-		<term bibtexname="year" indexname="resultdateofacceptance"/>
-	</case>
-	<case value="MasterThesis" bibTexType="masterthesis">
-		<term bibtexname="author" indexname="relperson"/>
-		<term bibtexname="title" indexname="resulttitle"/>
-		<term bibtexname="school" indexname="affiliationname"/>
-		<term bibtexname="year" indexname="resultdateofacceptance"/>
-	</case>
-	<case value="DoctoralThesis" bibTexType="phdthesis">
-		<term bibtexname="author" indexname="relperson"/>
-		<term bibtexname="title" indexname="resulttitle"/>
-		<term bibtexname="school" indexname="affiliationname"/>
-		<term bibtexname="year" indexname="resultdateofacceptance"/>
-	</case>
-	<case value="Report" bibTexType="techreport">
-		<term bibtexname="author" indexname="relperson"/>
-		<term bibtexname="title" indexname="resulttitle"/>
-		<term bibtexname="institution" indexname="affiliationname"/>	
-	</case>
-	<defaultcase bibTexType="misc">
-		<term bibtexname="author" indexname="relperson"/>
-		<term bibtexname="title" indexname="resulttitle"/>
-		<term bibtexname="year" indexname="resultdateofacceptance"/>
-	</defaultcase>
-</bibTexConfig>
-
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/json.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/json.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/json.xsl	(nonexistent)
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-xmlns:dri="http://www.driver-repository.eu/namespace/dri"
-xmlns:oaf="http://namespace.openaire.eu/oaf"
-xmlns:dc="http://purl.org/dc/elements/1.1/">
-<xsl:output method="text" indent="yes" encoding="UTF-8"/>
-
-<xsl:template match="/">
-
-	<xsl:apply-templates select="record/field"/>
-</xsl:template>
-
-<xsl:template match="field[@multiplicity='false' and not(node())]">
-
-	"<xsl:value-of select="./@name"/>": {
-		"label": "<xsl:value-of select="./@label"/>", 
-		"value": "<xsl:value-of select="./@value"/>"
-	<xsl:if test="../field[last()]/@name != ./@name">},</xsl:if>	
-	<xsl:if test="../field[last()]/@name = ./@name">}</xsl:if>
-
-</xsl:template>
-
-<xsl:template match="field[@multiplicity='true' and not(node())]">
-	
-	<xsl:if test="preceding-sibling::field[1]/@name != current()/@name">
-
-		"<xsl:value-of select="./@name"/>": {
-			"label": "<xsl:value-of select="./@label"/>", 
-			"value": ["<xsl:value-of select="../field[@name=current()/@name]/@value" separator='", "'/>"]		
-		<xsl:if test="../field[last()]/@name != ./@name">},</xsl:if>	
-		<xsl:if test="../field[last()]/@name = ./@name">}</xsl:if>
-	</xsl:if>	
-</xsl:template>
-
-<xsl:template match="field[@multiplicity = 'true' and node()]">
-
-	<xsl:if test="preceding-sibling::field[1]/@name != current()/@name">
-	
-		"<xsl:value-of select="./@name"/>": {
-			"label": "<xsl:value-of select="./@label"/>", 
-			"value": [	
-				{<xsl:apply-templates select="./node()"/>}
-				<xsl:if test="position() != last()">,<xsl:value-of select="position()"/>-<xsl:value-of select="./node()[position() = last()]/@name"/></xsl:if>	
-				<!-- to idio gia ola ta siblings me to idio name -->
-				<xsl:for-each select="following-sibling::field[@name = current()/@name]">
-					{<xsl:apply-templates select="./node()"/>}
-					<xsl:if test="position() != last()">,</xsl:if>				
-				</xsl:for-each>			
-			]		
-		<xsl:if test="../field[last()]/@name != ./@name">},</xsl:if>	
-		<xsl:if test="../field[last()]/@name = ./@name">}</xsl:if>
-	</xsl:if>	
-
-</xsl:template>
-
-
-</xsl:stylesheet>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/simple.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/simple.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/simple.xsl	(nonexistent)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-xmlns:dri="http://www.driver-repository.eu/namespace/dri"
-xmlns:oaf="http://namespace.openaire.eu/oaf">
-<xsl:output method="xml" indent="yes" encoding="UTF-8" />
-<xsl:template match="/">
-	<xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="@*|node()">
-	<xsl:copy>
-		<xsl:apply-templates select="@*|node()"/>
-	</xsl:copy>
-</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/bibtex.vm
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/bibtex.vm	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/bibtex.vm	(nonexistent)
@@ -1,77 +0,0 @@
-#macro(keys)
-	#foreach($key in $keys)<xsl:value-of select="$key"/>#end
-#end
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<xsl:output method="xml" indent="yes" encoding="UTF-8"/>
-<xsl:template match="/">
-	<xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="@*|node()">
-	<xsl:copy>
-		<xsl:apply-templates select="/response/results/result"/>
-	</xsl:copy>
-</xsl:template>
-
-<xsl:template match="result">
-<result>
-<xsl:choose>
-	<xsl:when test="field[@indexId='resulttypeid']/@value='publication'">
-			
-	@article{<xsl:value-of select="substring-before(field/field[@indexId='personfullname']/@value,' ')"/>	
-				<xsl:value-of select="substring-before(field[@indexId='resultdateofacceptance']/@value,'-')"/>
-				<xsl:value-of select="substring-before(field[@indexId='resulttitle']/@value,' ')"/>
-					
-				<xsl:if test="field[@indexId='dc:source']/@value !=''">
-		journal = "<xsl:for-each select="field[@indexId='dc:source']"><xsl:if test="position()>1"> and </xsl:if><xsl:value-of select='./@value'/></xsl:for-each>",	
-		</xsl:if>
-				<xsl:if test="field/field[@indexId='personfullname']/@value !=''">
-		
-		author = "<xsl:for-each select="field/field[@indexId='personfullname']"><xsl:if test="position()>1"> and </xsl:if><xsl:value-of select='./@value'/></xsl:for-each>",	
-		</xsl:if>
-				<xsl:if test="field[@indexId='resulttitle']/@value !=''">
-		
-		title = "<xsl:for-each select="field[@indexId='resulttitle']"><xsl:if test="position()>1"> and </xsl:if><xsl:value-of select='./@value'/></xsl:for-each>",	
-		</xsl:if>
-		<xsl:if test="field[@indexId='resultdateofacceptance']/@value !=''">
-		
-		year = "<xsl:for-each select="field[@indexId='resultdateofacceptance']/@value"><xsl:if test="position()>1"> and </xsl:if><xsl:value-of select="substring-before(.,'-')"/></xsl:for-each>"	
-		</xsl:if>
-		}
-	</xsl:when>
-
-	
-#foreach ($case in $cases)	
-	<xsl:when test="field[@indexId='$name']/@value='$case.getXmlName()'">
-
-	@$case.getBibtexName(){#keys()
-		#foreach ($termKey in $case.getFields().keySet())
-		<xsl:if test="field[@indexId='$case.getFields().get($termKey)']/@value !=''">
-		$termKey = "<xsl:for-each select="field[@indexId='$case.getFields().get($termKey)']"><xsl:if test="position()>1"> and </xsl:if><xsl:value-of select="./@value"/></xsl:for-each>",</xsl:if>
-		#end
-	}
-	</xsl:when>
-#end
-	<xsl:otherwise>
-	@$defaultcase.getBibtexName(){#keys()
-		#foreach ($termKey in $defaultcase.getFields().keySet())
-		<xsl:if test="//field[@indexId='$defaultcase.getFields().get($termKey)']/@value !=''">
-		$termKey = "<xsl:for-each select="field[@indexId='$defaultcase.getFields().get($termKey)']"><xsl:if test="position()>1"> and </xsl:if><xsl:value-of select="./@value"/></xsl:for-each>",</xsl:if>
-		#end
-	}
-	
-	</xsl:otherwise>
-</xsl:choose>
-</result>
-</xsl:template>
-
-
-<xsl:template match="@*|node()">
-	<xsl:copy>
-		<xsl:apply-templates select="@*|node()"/>
-	</xsl:copy>
-</xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/omit-xml-declaration.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/omit-xml-declaration.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/omit-xml-declaration.xsl	(nonexistent)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-xmlns:dri="http://www.driver-repository.eu/namespace/dri"
-xmlns:oaf="http://namespace.openaire.eu/oaf">
-<xsl:output method="xml" indent="yes" encoding="UTF-8" omit-xml-declaration="yes"/>
-<xsl:template match="/">
-	<xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="@*|node()">
-	<xsl:copy>
-		<xsl:apply-templates select="@*|node()"/>
-	</xsl:copy>
-</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/Shortlistoflanguagenames_es_ES.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/Shortlistoflanguagenames_es_ES.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/Shortlistoflanguagenames_es_ES.xml	(nonexistent)
@@ -1,214 +0,0 @@
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value="54dae08c-d67c-4251-8322-2e5d29149ab7_Vm9jYWJ1bGFyeURTUmVzb3VyY2VzL1ZvY2FidWxhcnlEU1Jlc291cmNlVHlwZQ=="/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value=""/>
-        <DATE_OF_CREATION value="2010-12-23T19:06:29+01:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Short list of language names_es_ES</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>ISO 639-2 list of languages. It defines mapping from iso639-1 and DRIVER derived values.</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM encoding="alb/sqi" english_name="Albano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sq"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ara" english_name="Árabe" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ar"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="baq/eus" english_name="Euskera" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="eu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bul" english_name="Búlgaro" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bg"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bel" english_name="Bielorruso" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="be"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="cat" english_name="Catalán" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ca"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="chi/zho" english_name="Chino" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="zh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="" english_name="Croata" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ces/cze" english_name="Checo" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="cs"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="dan" english_name="Danés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="da"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="dut/nla" english_name="Holandés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="nl"/>
-                        <SYNONYM encoding="DRIVER" term="nl_nl"/>
-                        <SYNONYM encoding="DRIVER" term="nl_be"/>
-                        <SYNONYM encoding="DRIVER" term="nld"/>
-                        <SYNONYM encoding="DRIVER" term="dutdut"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="eng" english_name="Inglés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="en"/>
-                        <SYNONYM encoding="DRIVER" term="english"/>
-                        <SYNONYM encoding="DRIVER" term="en_us"/>
-                        <SYNONYM encoding="DRIVER" term="en_en"/>
-                        <SYNONYM encoding="DRIVER" term="en_au"/>
-                        <SYNONYM encoding="DRIVER" term="en_nz"/>
-                        <SYNONYM encoding="DRIVER" term="en_gb"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="epo" english_name="Esperanto" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="eo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="est" english_name="Estonio" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="et"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="fin" english_name="Finlandés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="fra/fre" english_name="Francés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fr"/>
-                        <SYNONYM encoding="DRIVER" term="fr_be"/>
-                        <SYNONYM encoding="DRIVER" term="fr_fr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="deu/ger" english_name="Alemán" native_name="Deutsch">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="de"/>
-                        <SYNONYM encoding="iso639-1" term="german"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ell/gre" english_name="Griego" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="el"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="hun" english_name="Húngaro" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ice/isl" english_name="Islandés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="is"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ita" english_name="Italiano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="it"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="jpn" english_name="Japonés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ja"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lat" english_name="Latín" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="la"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mon" english_name="Mongol" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mul" english_name="Múltiples idiomas" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nep" english_name="Nepalí" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ne"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="nor" english_name="Noruego" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="no"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="pol" english_name="Polaco" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="por" english_name="Portugués" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pt"/>
-                        <SYNONYM encoding="DRIVER" term="pt_pt"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ron/rum" english_name="Rumano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ro"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="rus" english_name="Ruso" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ru"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="slk/slo" english_name="Eslovako" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="slv" english_name="Esloveno" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="esl/spa" english_name="Español" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="es"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sve/swe" english_name="Sueco" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sv"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="cym/wel" english_name="Galés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="cy"/>
-                    </SYNONYMS>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2007-04-27T16:45:24+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
-
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/funders.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/funders.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/funders.xml	(nonexistent)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value=""/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2008-06-25T14:50:49+02:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Programmes</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>Programmes descriptions</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM encoding="ec::FP7" english_name="FP7" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="wt::WT" native_name="" english_name="Wellcome Trust">
-                    <SYNONYMS/>
-                </TERM>                
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-06-25T14:50:49+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/Shortlistoflanguagenames.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/Shortlistoflanguagenames.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/Shortlistoflanguagenames.xml	(nonexistent)
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value="1-524b117b-c3fe-4355-b6d9-50e87036455f_Vm9jYWJ1bGFyeURTUmVzb3VyY2VzL1ZvY2FidWxhcnlEU1Jlc291cmNlVHlwZQ=="/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value=""/>
-        <DATE_OF_CREATION value="2008-03-11T16:29:38+01:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Short list of language names</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>ISO 639-2 list of languages. It defines mapping from iso639-1 and DRIVER derived values.</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM english_name="Albanian" encoding="alb/sqi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="sq" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ara" english_name="Arabic" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="ar" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Basque" encoding="baq/eus" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="eu" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="bul" english_name="Bulgarian">
-                    <SYNONYMS>
-                        <SYNONYM term="bg" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Byelorussian" encoding="bel">
-                    <SYNONYMS>
-                        <SYNONYM term="be" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="cat" english_name="Catalan" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ca"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="chi/zho" native_name="" english_name="Chinese">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="zh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Croatian" encoding="">
-                    <SYNONYMS>
-                        <SYNONYM term="hr" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Czech" encoding="ces/cze">
-                    <SYNONYMS>
-                        <SYNONYM term="cs" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Danish" native_name="" encoding="dan">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="da"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Dutch" encoding="dut/nla">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="nl"/>
-                        <SYNONYM term="nl_nl" encoding="DRIVER"/>
-                        <SYNONYM encoding="DRIVER" term="nl_be"/>
-                        <SYNONYM encoding="DRIVER" term="nld"/>
-                        <SYNONYM term="dutdut" encoding="DRIVER"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="English" native_name="" encoding="eng">
-                    <SYNONYMS>
-                        <SYNONYM term="en" encoding="iso639-1"/>
-                        <SYNONYM term="english" encoding="DRIVER"/>
-                        <SYNONYM term="en_us" encoding="DRIVER"/>
-                        <SYNONYM term="en_en" encoding="DRIVER"/>
-                        <SYNONYM encoding="DRIVER" term="en_au"/>
-                        <SYNONYM encoding="DRIVER" term="en_nz"/>
-                        <SYNONYM encoding="DRIVER" term="en_gb"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="epo" native_name="" english_name="Esperanto">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="eo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="est" english_name="Estonian">
-                    <SYNONYMS>
-                        <SYNONYM term="et" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Finnish" encoding="fin">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="fra/fre" english_name="French">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fr"/>
-                        <SYNONYM encoding="DRIVER" term="fr_be"/>
-                        <SYNONYM encoding="DRIVER" term="fr_fr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="German" encoding="deu/ger" native_name="Deutsch">
-                    <SYNONYMS>
-                        <SYNONYM term="de" encoding="iso639-1"/>
-                        <SYNONYM term="german" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ell/gre" native_name="" english_name="Greek">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="el"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="hun" native_name="" english_name="Hungarian">
-                    <SYNONYMS>
-                        <SYNONYM term="hu" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Icelandic" encoding="ice/isl" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="is" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Italian" encoding="ita">
-                    <SYNONYMS>
-                        <SYNONYM term="it" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Japanese" encoding="jpn">
-                    <SYNONYMS>
-                        <SYNONYM term="ja" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="lat" english_name="Latin">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="la"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Mongolian" encoding="mon">
-                    <SYNONYMS>
-                        <SYNONYM term="mn" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Multiple languages" encoding="mul" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nep" native_name="" english_name="Nepali">
-                    <SYNONYMS>
-                        <SYNONYM term="ne" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="nor" english_name="Norwegian">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="no"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Polish" native_name="" encoding="pol">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="por" english_name="Portuguese">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pt"/>
-                        <SYNONYM encoding="DRIVER" term="pt_pt"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ron/rum" english_name="Romanian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ro"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Russian" native_name="" encoding="rus">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ru"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="slk/slo" native_name="" english_name="Slovak">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Slovenian" native_name="" encoding="slv">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Spanish" encoding="esl/spa" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="es" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="sve/swe" english_name="Swedish">
-                    <SYNONYMS>
-                        <SYNONYM term="sv" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Welsh" encoding="cym/wel" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="cy"/>
-                    </SYNONYMS>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2007-04-27T16:45:24+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/NamesofTextObjectTypologies_pl_PL.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/NamesofTextObjectTypologies_pl_PL.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/NamesofTextObjectTypologies_pl_PL.xml	(nonexistent)
@@ -1,116 +0,0 @@
-<RESOURCE_PROFILE xmlns:xsi="http://www.w2.org/2001/XMLSchema-instance">
-    <HEADER>
-        <RESOURCE_IDENTIFIER value="e86f2220-5e5b-47e7-bb52-f085a3048313_Vm9jYWJ1bGFyeURTUmVzb3VyY2VzL1ZvY2FidWxhcnlEU1Jlc291cmNlVHlwZQ=="/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2011-09-28T09:44:08+00:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Names of Text Object Typologies_pl_PL</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>List of typology types provided by the DRIVER Guidelines for Repository content</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM encoding="0000" english_name="Nieznany" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0001" english_name="Artykuł" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVER" term="Artykuł w monografii"/>
-                        <SYNONYM encoding="DRIVER" term="Artykuł/List do redakcji"/>
-                        <SYNONYM encoding="DRIVER" term="Artykuł / List do redakcji"/>
-                        <SYNONYM encoding="DRIVER" term="Artykuł / List do redakcji"/>
-                        <SYNONYM encoding="DRIVER" term="Artykuł-list do redakcji"/>
-                        <SYNONYM encoding="DRIVER" term="Artykuł - list do redakcji"/>
-                        <SYNONYM encoding="DRIVER" term="Artykuł w czasopiśmie"/>
-                        <SYNONYM encoding="DRIVER" term="Artykuł w czasopiśmie (internetowym lub drukowanym)"/>
-                        <SYNONYM encoding="DRIVER" term="Artykuł zrecenzowany"/>
-                        <SYNONYM encoding="DRIVER" term="Artykuł / Gazeta"/>
-                        <SYNONYM encoding="DRIVER" term="Autykuł"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0002" english_name="Książka" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVER" term="Książka (monografia)"/>
-                        <SYNONYM encoding="DRIVER" term="Książka - monografia"/>
-                        <SYNONYM encoding="DRIVER" term="Część książki"/>
-                        <SYNONYM encoding="DRIVER" term="Monografia"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0003" english_name="Wykład konferencyjny" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0004" english_name="Materiał konferencyjny" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVER" term="Materiał z workshopu"/>
-                        <SYNONYM encoding="DRIVER" term="Referat konferencyjny"/>
-                        <SYNONYM encoding="DRIVER" term="Wystąpienie na konferencji"/>
-                        <SYNONYM encoding="DRIVER" term="Referat konferencyjny"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0005" english_name="Artykuł w dzienniku lub tygodniku" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0006" english_name="Doktorat" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DINI" term="Tekst.Rozprawa.Doktorska"/>
-                        <SYNONYM encoding="DRIVER" term="Rozprawa.Doktorska"/>
-                        <SYNONYM encoding="DRIVER" term="Dysertacja"/>
-                        <SYNONYM encoding="DRIVER" term="Dys"/>
-                        <SYNONYM encoding="DRIVER" term="DoktorskaRozprawa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0007" english_name="Praca magisterska" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DINI" term="Praca-Magisterska.Magister"/>
-                        <SYNONYM encoding="DRIVER" term="Rozprawa.Magisterska"/>
-                        <SYNONYM encoding="DRIVER" term="Magisterska rozprawa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0008" english_name="Praca licencjacka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0009" english_name="Raport z badań" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DINI" term="Raport techniczny"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0010" english_name="Wykład" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DINI" term="Wykład publiczny"/>
-                        <SYNONYM encoding="DRIVER" term="Wykład inauguracyjny"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0011" english_name="Raport wewnętrzny" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0012" english_name="Newsletter" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0013" english_name="Część książki lub rozdział książki" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVER" term="Część książki - rozdział"/>
-                        <SYNONYM encoding="DRIVER" term="Wstęp do książki"/>
-                        <SYNONYM encoding="DRIVER" term="Część książki"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0014" english_name="Referat" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0015" english_name="Wzbogacona publikacja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0016" english_name="Zbiór" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0017" english_name="Dane badawcze" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2007-05-06T23:02:07+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS/>
-    </BODY>
-</RESOURCE_PROFILE>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/NamesofCountries_pl_PL.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/NamesofCountries_pl_PL.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/NamesofCountries_pl_PL.xml	(nonexistent)
@@ -1,762 +0,0 @@
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value="3-959aed5b-9ccc-40ff-9791-352d05098cdd_Vm9jYWJ1bGFyeURTUmVzb3VyY2VzL1ZvY2FidWxhcnlEU1Jlc291cmNlVHlwZQ=="/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2009-06-25T14:50:49+02:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Names of Countries_pl_PL</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>OASIS list of country codes Country Code List: ISO 3166-1993 (E). No mappings provided.</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM encoding="AD" english_name="Andora" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AE" english_name="Zjednoczone Emiraty Arabskie" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AF" english_name="Afganistan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AG" english_name="Antigua i Barbuda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AI" english_name="Anguilla" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AL" english_name="Albania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AM" english_name="Armenia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AN" english_name="Antyle Holenderskie" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AO" english_name="Angola" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AQ" english_name="Antarktyda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AR" english_name="Argentyna" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AS" english_name="Samoa Amerykańskie" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AT" english_name="Austria" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AU" english_name="Australia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AW" english_name="Aruba" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AZ" english_name="Azerbejdżan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BA" english_name="Bonia i Hercegowina" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BB" english_name="Barbados" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BD" english_name="Bangladesz" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BE" english_name="Belgia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BF" english_name="Burkina Faso" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BG" english_name="Bułgaria" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BH" english_name="Bahrajn" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BI" english_name="Burundi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BJ" english_name="Benin" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BM" english_name="Bermudy" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BN" english_name="Brunei" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BO" english_name="Boliwia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BR" english_name="Brazylia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BS" english_name="Bahamy" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BT" english_name="Bhutan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BU" english_name="Burma" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BV" english_name="Wyspy Bouveta" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BW" english_name="Botswana" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BY" english_name="Białoru" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BZ" english_name="Belize" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CA" english_name="Kanada" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CC" english_name="Wyspy Kokosowe" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CF" english_name="Republika rodkowoafrykańska" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CG" english_name="Demokratyczna Republika Konga" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CH" english_name="Szwajcaria" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CI" english_name="Wybrzeże Koci Słoniowej" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CK" english_name="Wyspy Cooka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CL" english_name="Chile" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CM" english_name="Kamerun" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CN" english_name="Chiny" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CO" english_name="Kolumbia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CR" english_name="Kostaryka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CS" english_name="Czechosłowacja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CU" english_name="Kuba" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CV" english_name="Republika Zielonego Przylšdka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CX" english_name="Wyspa Bożego Narodzenia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CY" english_name="Cypr" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CZ" english_name="Czechy" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DD" english_name="Niemiecka Republika Demokratyczna (nie istnieje)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DE" english_name="Niemcy" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DJ" english_name="Dżibuti" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DK" english_name="Dania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DM" english_name="Dominika" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DO" english_name="Dominikana" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DZ" english_name="Algieria" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="EC" english_name="Ekwador" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="EE" english_name="Estonia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="EG" english_name="Egipt" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="EH" english_name="Sahara Zachodnia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ER" english_name="Erytrea" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ES" english_name="Hiszpania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ET" english_name="Etiopia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FI" english_name="Finlandia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FJ" english_name="Fidżi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FK" english_name="Falklandy" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FM" english_name="Mikronezja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FO" english_name="Wyspy Owcze" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FR" english_name="Francja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FX" english_name="Francja metropolitarna" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GA" english_name="Gabon" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UK" english_name="Wielka Brytania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GD" english_name="Grenada" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GE" english_name="Gruzja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GF" english_name="Gujana Francuska" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GH" english_name="Ghana" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GI" english_name="Gibraltar" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GL" english_name="Grenlandia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GM" english_name="Gambia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GN" english_name="Gwinea" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GP" english_name="Gwadelupa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GQ" english_name="Gwinea Równikowa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GR" english_name="Grecja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GS" english_name="Georgia Południowa i Sandwich Południowy" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GT" english_name="Gwatemala" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GU" english_name="Guam" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GW" english_name="Gwinea Bissau" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GY" english_name="Gujana" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HK" english_name="Hongkong" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HM" english_name="Wyspy Heard i McDonald" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HN" english_name="Honduras" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HR" english_name="Chorwacja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HT" english_name="Haiti" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HU" english_name="Węgry" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ID" english_name="Indonezja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IE" english_name="Irlandia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IL" english_name="Izrael" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IN" english_name="Indie" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IO" english_name="Brytyjskie Terytorium Oceanu Indyjskiego" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IQ" english_name="Irak" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IR" english_name="Iran" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IS" english_name="Islandia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IT" english_name="Włochy" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="JM" english_name="Jamajka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="JO" english_name="Jordania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="JP" english_name="Japonia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KE" english_name="Kenia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KG" english_name="Kirgistan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KH" english_name="Kambodża" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KI" english_name="Kiribati" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KM" english_name="Komory" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KN" english_name="St. Kitts i Nevis" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KP" english_name="Korea Północna" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KR" english_name="Korea Południowa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KW" english_name="Kuwejt" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KY" english_name="Kajmany" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KZ" english_name="Kazachstan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LA" english_name="Laos" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LB" english_name="Liban" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LC" english_name="Saint Lucia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LI" english_name="Liechtenstein" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LK" english_name="Sri Lanka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LR" english_name="Liberia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LS" english_name="Lesotho" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LT" english_name="Litwa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LU" english_name="Luksemburg" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LV" english_name="Łotwa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LY" english_name="Libia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MA" english_name="Maroko" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MC" english_name="Monaco" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MD" english_name="Mołdawia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MG" english_name="Madagaskar" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MG" english_name="Madagaskar" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MH" english_name="Wyspy Marshalla" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ML" english_name="Mali" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MN" english_name="Mongolia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MM" english_name="Birma" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MO" english_name="Makau" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MP" english_name="Mariany Północne" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MQ" english_name="Martynika" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MR" english_name="Mauretania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MS" english_name="Monserrat" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MT" english_name="Malta" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MU" english_name="Mauritius" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MV" english_name="Malediwy" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MW" english_name="Malawi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MX" english_name="Meksyk" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MY" english_name="Malezja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MZ" english_name="Mozambik" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NA" english_name="Namibia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NC" english_name="Nowa Kaledonia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NE" english_name="Niger" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NF" english_name="Norfolk" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NG" english_name="Nigeria" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NI" english_name="Nikaragua" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NL" english_name="Holandia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NO" english_name="Norwegia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NP" english_name="Nepal" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NR" english_name="Nauru" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NT" english_name="Strefa neutralna (nie istnieje)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NU" english_name="Niue" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NZ" english_name="Nowa Zelandia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="OM" english_name="Oman" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PA" english_name="Panama" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PE" english_name="Peru" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PF" english_name="Polinezja Francuska" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PG" english_name="Papua-Nowa Gwinea" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PH" english_name="Filipiny" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PK" english_name="Pakistan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PL" english_name="Polska" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PM" english_name="St. Pierre i Miquelon" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PN" english_name="Pitcairn" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PR" english_name="Portoryko" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PT" english_name="Portugalia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PW" english_name="Palau" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PY" english_name="Paragwaj" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="QA" english_name="Katar" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="RE" english_name="R&amp;eacute;union" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="RO" english_name="Rumunia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="RU" english_name="Rosja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="RW" english_name="Rwanda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SA" english_name="Arabia Saudyjska" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SB" english_name="Wyspy Salomona" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SC" english_name="Seszele" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SD" english_name="Sudan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SE" english_name="Szwecja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SG" english_name="Singapur" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SH" english_name="Wyspa w. Heleny" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SI" english_name="Słowenia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SJ" english_name="Svalbard i Jan Mayen" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SK" english_name="Słowacja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SL" english_name="Sierra Leone" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SM" english_name="San Marino" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SN" english_name="Senegal" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SO" english_name="Somalia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SR" english_name="Surinam" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ST" english_name="Wyspy więtego Tomasza i Ksišżęca" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SU" english_name="Zwišzek Socjalistycznych Republik Radzieckich (nie istnieje)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SV" english_name="Salwador" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SY" english_name="Syria" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SZ" english_name="Suazi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TC" english_name="Turks i Caicos" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TD" english_name="Czad" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TF" english_name="Francuskie Terytoria Południowe i Antarktyczne" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TG" english_name="Togo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TH" english_name="Tailandia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TJ" english_name="Tadżykistan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TK" english_name="Tokelau" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TM" english_name="Turkmenistan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TN" english_name="Tunezja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TO" english_name="Tonga" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TP" english_name="Timor Wschodni" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TR" english_name="Turcja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TT" english_name="Trynidad i Tobago" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TV" english_name="Tuvalu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TW" english_name="Tajwan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TZ" english_name="Tanzania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UA" english_name="Ukraina" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UG" english_name="Uganda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UM" english_name="Dalekie Wyspy Mniejsze Stanów Zjednoczonych" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="US" english_name="Stany Zjednoczone" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="US" english_name="Stany Zjednoczone" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UY" english_name="Urugwaj" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UZ" english_name="Uzbekistan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VA" english_name="Watykan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VC" english_name="St. Vincent i Grenadyny" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VE" english_name="Wenezuela" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VG" english_name="Brytyjskie Wyspy Dziewicze" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VI" english_name="Wyspy Dziewicze Stanów Zjednoczonych" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VN" english_name="Wietnam" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VU" english_name="Vanuatu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="WF" english_name="Wallis i Futuna" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="WS" english_name="Samoa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="YD" english_name="Jemen Demokratyczny (nie istnieje)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="YE" english_name="Jemen" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="YT" english_name="Majotta" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="YU" english_name="Jugosławia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ZA" english_name="Republika Południowej Afryki" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ZM" english_name="Zambia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ZR" english_name="Zair" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ZW" english_name="Zimbabwe" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ZZ" english_name="Nieznane lub nieokrelone państwo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-06-25T14:50:49+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/areas.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/areas.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/areas.xml	(nonexistent)
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value=""/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2008-06-25T14:50:49+02:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Programmes</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>Programmes descriptions</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM encoding="FP7::SP2::ERC" english_name="ERC" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FP7::SP3::PEOPLE" english_name="PEOPLE" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FP7::SP1::ICT" english_name="ICT" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FP7::SP1::TPT" english_name="TPT" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FP7::SP1::ENV" english_name="ENV" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FP7::SP1::KBBE" english_name="KBBE" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                 <TERM encoding="FP7::SP1::HEALTH" english_name="HEALTH" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FP7::SP1::NMP" english_name="NMP" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FP7::SP1::ENERGY" english_name="ENERGY" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FP7::SP1::SPA" english_name="SPA" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FP7::SP1::SSH" english_name="SSH" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FP7::SP1::GA" english_name="GA" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FP7::SP1::SEC" english_name="SEC" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FP7::SP4::SME" english_name="SME" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FP7::SP4::REGIONS" english_name="REGIONS" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                 <TERM encoding="FP7::SP4::INFRA" english_name="SME" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FP7::SP4::INCO" english_name="INCO" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FP7::SP4::REGPOT" english_name="REGPOT" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FP7::SP4::SiS" english_name="SiS" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FP7::SP5::Fission" english_name="Fission" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FP7::SP5::Fusion" english_name="Fusion" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-06-25T14:50:49+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/programmes.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/programmes.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/programmes.xml	(nonexistent)
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value=""/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2008-06-25T14:50:49+02:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Programmes</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>Programmes descriptions</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM encoding="FP7::SP1" english_name="Cooperation" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FP7::SP2" english_name="Ideas" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FP7::SP3" english_name="People" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FP7::SP4" english_name="Capacities" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FP7::SP5" english_name="Euratom" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="Wellcome Trust::Grants Management Awards (VIP &amp; Open Access)" english_name="Grants Management Awards (VIP &amp; Open Access)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="Wellcome Trust::Medicine, Society and History" english_name="Medicine, Society and History" native_name="">
-                    <SYNONYMS/>
-                </TERM>                
-                <TERM encoding="Wellcome Trust::Molecules, Genes and Cells" english_name="Molecules, Genes and Cells" native_name="">
-                    <SYNONYMS/>
-                </TERM>                
-                <TERM encoding="Wellcome Trust::Immunology and Infectious Disease" english_name="Immunology and Infectious Disease" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="Wellcome Trust::Infection &amp; Immunity Panel" english_name="Infection &amp; Immunity Panel" native_name="">
-                    <SYNONYMS/>
-                </TERM>                
-                <TERM encoding="Wellcome Trust::Neurosciences and Mental Health, Molecular and Cellular Neurosciences, Cognitive and Higher Systems" english_name="Neurosciences and Mental Health, Molecular and Cellular Neurosciences, Cognitive and Higher Systems" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="Wellcome Trust::Populations and Public Health" english_name="Populations and Public Health" native_name="">
-                    <SYNONYMS/>
-                </TERM>                
-                <TERM encoding="Wellcome Trust::Technology Transfer Division" english_name="Technology Transfer Division" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="Wellcome Trust::Physiological Sciences" english_name="Physiological Sciences" native_name="">
-                    <SYNONYMS/>
-                </TERM>                              
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-06-25T14:50:49+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/NamesofLanguages_es_ES.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/NamesofLanguages_es_ES.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/NamesofLanguages_es_ES.xml	(nonexistent)
@@ -1,1534 +0,0 @@
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value="5643626a-0276-4734-ad06-9d93c8595539_Vm9jYWJ1bGFyeURTUmVzb3VyY2VzL1ZvY2FidWxhcnlEU1Jlc291cmNlVHlwZQ=="/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value=""/>
-        <DATE_OF_CREATION value="2010-12-23T19:06:56+01:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Names of Languages_es_ES</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>ISO 639-2 list of languages. It defines mapping from iso639-1 and DRIVER derived values.</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM encoding="abk" english_name="Abkhaziano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ab"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ace" english_name="Achinese" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ach" english_name="Acoli" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ada" english_name="Adangme" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="aar" english_name="Afar" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="aa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="afh" english_name="Afrihili" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="afr" english_name="Afrikaans" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="af"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="afa" english_name="Afro-Asiatic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="aka" english_name="Akan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="akk" english_name="Akkadian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="alb/sqi" english_name="Albano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sq"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ale" english_name="Aleut" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="alg" english_name="Algonquian languages" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tut" english_name="Altaic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="amh" english_name="Amárico" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="am"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="apa" english_name="Apache" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ara" english_name="Árabe" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ar"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="arc" english_name="Aramaic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="arp" english_name="Arapaho" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="arn" english_name="Araucanian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="arw" english_name="Arawak" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="arm/hye" english_name="Armenio" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hy"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="art" english_name="Artificial" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="asm" english_name="Asamés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="as"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ath" english_name="Athapascan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="map" english_name="Austronesian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ava" english_name="Avaric" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ave" english_name="Avestan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="awa" english_name="Awadhi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="aym" english_name="Aymará" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ay"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="aze" english_name="Azerí" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="az"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="nah" english_name="Aztec" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ban" english_name="Balinese" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bat" english_name="Baltic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bal" english_name="Baluchi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bam" english_name="Bambara" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bai" english_name="Bamileke" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bad" english_name="Banda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bnt" english_name="Bantu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bas" english_name="Basa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bak" english_name="Bashkir" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ba"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="baq/eus" english_name="Euskera" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="eu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bej" english_name="Beja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bem" english_name="Bemba" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ben" english_name="Bengalí" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ber" english_name="Berber" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bho" english_name="Bhojpuri" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bih" english_name="Bihari" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bik" english_name="Bikol" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bin" english_name="Bini" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bis" english_name="Bislama" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bra" english_name="Braj" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bre" english_name="Bretón" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="br"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bug" english_name="Buginese" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bul" english_name="Búlgaro" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bg"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bua" english_name="Buriat" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bur/mya" english_name="Birmano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="my"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bel" english_name="Bielorruso" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="be"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="cad" english_name="Caddo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="car" english_name="Carib" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cat" english_name="Catalán" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ca"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="cau" english_name="Caucasian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ceb" english_name="Cebuano" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cel" english_name="Celtic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cai" english_name="Central American Indian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chg" english_name="Chagatai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cha" english_name="Chamorro" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="che" english_name="Chechen" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chr" english_name="Cherokee" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chy" english_name="Cheyenne" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chb" english_name="Chibcha" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chi/zho" english_name="Chino" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="zh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="chn" english_name="Chinook jargon" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cho" english_name="Choctaw" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chu" english_name="Church Slavic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chv" english_name="Chuvash" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cop" english_name="Coptic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cor" english_name="Cornish" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cos" english_name="Corso" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="co"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="cre" english_name="Cree" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mus" english_name="Creek" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="crp" english_name="Creoles and Pidgins" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cpe" english_name="English-based Creoles and Pidgins" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cpf" english_name="French-based Creoles and Pidgins" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cpp" english_name="Portuguese-based Creoles and Pidgins" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cus" english_name="Cushitic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="" english_name="Croata" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ces/cze" english_name="Checo" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="cs"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="dak" english_name="Dakota" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dan" english_name="Danés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="da"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="del" english_name="Delaware" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="din" english_name="Dinka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="div" english_name="Divehi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="doi" english_name="Dogri" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dra" english_name="Dravidian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dua" english_name="Duala" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dut/nla" english_name="Holandés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="nl"/>
-                        <SYNONYM encoding="DRIVER" term="nl_nl"/>
-                        <SYNONYM encoding="DRIVER" term="nl_be"/>
-                        <SYNONYM encoding="DRIVER" term="nld"/>
-                        <SYNONYM encoding="DRIVER" term="dutdut"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="dum" english_name="Middle Dutch" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dyu" english_name="Dyula" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dzo" english_name="Dzongkha" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="dz"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="efi" english_name="Efik" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="egy" english_name="Ancient Egyptian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="eka" english_name="Ekajuk" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="elx" english_name="Elamite" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="eng" english_name="Inglés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="en"/>
-                        <SYNONYM encoding="DRIVER" term="english"/>
-                        <SYNONYM encoding="DRIVER" term="en_us"/>
-                        <SYNONYM encoding="DRIVER" term="en_en"/>
-                        <SYNONYM encoding="DRIVER" term="en_au"/>
-                        <SYNONYM encoding="DRIVER" term="en_nz"/>
-                        <SYNONYM encoding="DRIVER" term="en_gb"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="enm" english_name="Middle English" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ang" english_name="Old English" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="esk" english_name="Eskimo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="epo" english_name="Esperanto" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="eo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="est" english_name="Estonio" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="et"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ewe" english_name="Ewe" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ewo" english_name="Ewondo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fan" english_name="Fang" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fat" english_name="Fanti" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fao" english_name="Feroés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="fij" english_name="Fijian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fj"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="fin" english_name="Finlandés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="fiu" english_name="Finno-Ugrian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fon" english_name="Fon" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fra/fre" english_name="Francés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fr"/>
-                        <SYNONYM encoding="DRIVER" term="fr_be"/>
-                        <SYNONYM encoding="DRIVER" term="fr_fr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="frm" english_name="Middle French" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fro" english_name="Old French" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fry" english_name="Frisio" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fy"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ful" english_name="Fulah" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gaa" english_name="Ga" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gae/gdh" english_name="Gaélico" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="glg" english_name="Gallego" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="gl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lug" english_name="Ganda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gay" english_name="Gayo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gez" english_name="Geez" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="geo/kat" english_name="Georgiano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ka"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="deu/ger" english_name="Alemán" native_name="Deutsch">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="de"/>
-                        <SYNONYM encoding="iso639-1" term="german"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="gmh" english_name="Middle High German" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="goh" english_name="Old High German" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gem" english_name="Germanic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gil" english_name="Gilbertese" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gon" english_name="Gondi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="got" english_name="Gothic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="grb" english_name="Grebo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="grc" english_name="Griego Clásico" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ell/gre" english_name="Griego" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="el"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kal" english_name="Groenlandés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="kl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="grn" english_name="Guaraní" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="gn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="guj" english_name="Gujarati" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="gu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="hai" english_name="Haida" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="hau" english_name="Hausa" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ha"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="haw" english_name="Hawaiian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="heb" english_name="Hebreo" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="he"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="her" english_name="Herero" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="hil" english_name="Hiligaynon" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="him" english_name="Himachali" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="hin" english_name="Hindi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="hmo" english_name="Hiri Motu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="hun" english_name="Húngaro" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="hup" english_name="Hupa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="iba" english_name="Iban" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ice/isl" english_name="Islandés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="is"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ibo" english_name="Igbo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ijo" english_name="Ijo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ilo" english_name="Iloko" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="inc" english_name="Indic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ine" english_name="Indo-European" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ind" english_name="Indonesio" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="id"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ina" english_name="Interlingua" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ia"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ine" english_name="Interlingue" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="-"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="iku" english_name="Inuktitut" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="iu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ipk" english_name="Inupiak" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ik"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ira" english_name="Iranian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gai/iri" english_name="Irlandés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ga"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="gle" english_name="Irish" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sga" english_name="old Irish" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mga" english_name="Middle Irish" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="iro" english_name="Iroquoian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ita" english_name="Italiano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="it"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="jpn" english_name="Japonés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ja"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="jav/jaw" english_name="Javanés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="jv/jw"/>
-                        <SYNONYM encoding="iso639-1" term="jv"/>
-                        <SYNONYM encoding="iso639-1" term="jw"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="jrb" english_name="Judeo-Arabic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="jpr" english_name="Judeo-Persian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kab" english_name="Kabyle" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kac" english_name="Kachin" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kam" english_name="Kamba" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kan" english_name="Kannada" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="kn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kau" english_name="Kanuri" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kaa" english_name="Kara-Kalpak" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kar" english_name="Karen" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kas" english_name="Kashmiri" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ks"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kaw" english_name="Kawi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kaz" english_name="Kazaj" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="kk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kha" english_name="Khasi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="khm" english_name="Khmer" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="km"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="khi" english_name="Khoisan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kho" english_name="Khotanese" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kik" english_name="Kikuyu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kin" english_name="Kinyarwanda" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="rw"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kir" english_name="Kirghiz" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ky"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kom" english_name="Komi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kon" english_name="Kongo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kok" english_name="Konkani" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kor" english_name="Coreano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ko"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kpe" english_name="Kpelle" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kro" english_name="Kru" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kua" english_name="Kuanyama" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kum" english_name="Kumyk" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kur" english_name="Kurdo" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ku"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kru" english_name="Kurukh" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kus" english_name="Kusaie" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kut" english_name="Kutenai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lad" english_name="Ladino" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lah" english_name="Lahnda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lam" english_name="Lamba" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="oci" english_name="Lengua de Oc" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="oc"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lao" english_name="Lao" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="lo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lat" english_name="Latín" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="la"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lav" english_name="Letón" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="lv"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ltz" english_name="Letzeburgesch" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lez" english_name="Lezghian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lin" english_name="Lingala" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ln"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lit" english_name="Lituano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="lt"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="loz" english_name="Lozi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lub" english_name="Luba-Katanga" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lui" english_name="Luiseno" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lun" english_name="Lunda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="luo" english_name="Luo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mac/mak" english_name="Macedonio" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mad" english_name="Madurese" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mag" english_name="Magahi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mai" english_name="Maithili" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mak" english_name="Makasar" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mlg" english_name="Malgache" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mg"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="may/msa" english_name="Malayo" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ms"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mal" english_name="Malayalam" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mlt" english_name="Maltés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ml"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="man" english_name="Mandingo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mni" english_name="Manipuri" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mno" english_name="Manobo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="max" english_name="Manx" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mao/mri" english_name="Maorí" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mar" english_name="Marathi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="chm" english_name="Mari" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mah" english_name="Marshall" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mwr" english_name="Marwari" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mas" english_name="Masai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="myn" english_name="Mayan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="men" english_name="Mende" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mic" english_name="Micmac" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="min" english_name="Minangkabau" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mis" english_name="Miscellaneous" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="moh" english_name="Mohawk" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mol" english_name="Moldavian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mkh" english_name="Mon-Kmer" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lol" english_name="Mongo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mon" english_name="Mongol" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mos" english_name="Mossi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mul" english_name="Multiple languages" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mun" english_name="Munda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nau" english_name="Naurí" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="na"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="nav" english_name="Navajo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nde" english_name="Ndebele" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nbl" english_name="Ndebele" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ndo" english_name="Ndongo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nep" english_name="Nepalés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ne"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="new" english_name="Newari" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nic" english_name="Niger-Kordofanian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ssa" english_name="Nilo-Saharan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="niu" english_name="Niuean" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="non" english_name="Norse" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nai" english_name="North American Indian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nor" english_name="Noruego" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="no"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="nno" english_name="Ngomba" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nub" english_name="Nubian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nym" english_name="Nyamwezi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nya" english_name="Nyanja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nyn" english_name="Nyankole" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nyo" english_name="Nyoro" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nzi" english_name="Nzima" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="oji" english_name="Ojibwa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ori" english_name="Oriya" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="or"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="orm" english_name="Oromo" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="om"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="osa" english_name="Osage" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="oss" english_name="Ossetic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="oto" english_name="Otomian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pal" english_name="Pahlavi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pau" english_name="Palauan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pli" english_name="Pali" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pam" english_name="Pampanga" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pag" english_name="Pangasinan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pan" english_name="Panjabi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="pap" english_name="Papiamento" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="paa" english_name="Papuan-Australian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fas/per" english_name="Persa" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="peo" english_name="Persian, Old (ca 600 - 400 B.C.)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="phn" english_name="Phoenician" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pol" english_name="Polaco" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="pon" english_name="Ponape" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="por" english_name="Portugués" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pt"/>
-                        <SYNONYM encoding="DRIVER" term="pt_pt"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="pra" english_name="Prakrit" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pro" english_name="Provencal" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pus" english_name="Pushto" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ps"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="que" english_name="Quechua" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="qu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="roh" english_name="Rhaeto-Romance" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="rm"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="raj" english_name="Rajasthani" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="rar" english_name="Rarotongan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="roa" english_name="Romance" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ron/rum" english_name="Rumano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ro"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="rom" english_name="Romany" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="run" english_name="Rundi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="rn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="rus" english_name="Ruso" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ru"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sal" english_name="Salishan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sam" english_name="Samaritan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="smi" english_name="Sami" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="smo" english_name="Samoan" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sm"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sad" english_name="Sandawe" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sag" english_name="Sango" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sg"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="san" english_name="Sánscrito" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="srd" english_name="Sardinian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sco" english_name="Scots" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sel" english_name="Selkup" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sem" english_name="Semitic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="" english_name="Serbio" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="scr" english_name="Serbo-Croata" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="srr" english_name="Serbian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="shn" english_name="Shan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sna" english_name="Shona" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sid" english_name="Sidamo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bla" english_name="Siksika" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="snd" english_name="Sindhi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sd"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sin" english_name="Singhalese" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="si"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sit" english_name="Sino-Tibetan" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="-"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sio" english_name="Siouan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sla" english_name="Slavic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ssw" english_name="Siswant" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ss"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="slk/slo" english_name="Eslovaco" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="slv" english_name="Esloveno" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sog" english_name="Sogdian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="som" english_name="Somalí" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="so"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="son" english_name="Songhai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="wen" english_name="Sorbian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nso" english_name="Sotho" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sot" english_name="Sotho" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="st"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sai" english_name="South American Indian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="esl/spa" english_name="Español" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="es"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="suk" english_name="Sukuma" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sux" english_name="Sumerian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sun" english_name="Sudanés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="su"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sus" english_name="Susu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="swa" english_name="Swahili" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sw"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ssw" english_name="Swazi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sve/swe" english_name="Sueco" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sv"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="syr" english_name="Syriac" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tgl" english_name="Tagalo" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tah" english_name="Tahitian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tgk" english_name="Tajik" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tg"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tmh" english_name="Tamashek" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tam" english_name="Tamil" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ta"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tat" english_name="Tatar" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tt"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tel" english_name="Telugu" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="te"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ter" english_name="Tereno" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tha" english_name="Tailandés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="th"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bod/tib" english_name="Tibetano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tig" english_name="Tigre" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tir" english_name="Tigrinya" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ti"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tem" english_name="Timne" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tiv" english_name="Tivi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tli" english_name="Tlingit" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tog" english_name="Tonga(Nyasa)" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="to"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ton" english_name="Tonga(Tonga Islands)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tru" english_name="Truk" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tsi" english_name="Tsimshian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tso" english_name="Tsonga" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ts"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tsn" english_name="Tswana" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tum" english_name="Tumbuka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tur" english_name="Turko" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ota" english_name="Ottoman" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tuk" english_name="Turkmen" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tyv" english_name="Tuvinian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="twi" english_name="Twi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tw"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="uga" english_name="Ugaritic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="uig" english_name="Uighur" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ug"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ukr" english_name="Ucraniano" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="uk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="umb" english_name="Umbundu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="und" english_name="Undetermined" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="urd" english_name="Urdu" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ur"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="uzb" english_name="Uzbeko" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="uz"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="vai" english_name="Vai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ven" english_name="Venda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="vie" english_name="Vietnamita" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="vi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="vol" english_name="VolapÃƒÂ¼k" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="vo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="vot" english_name="Votic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="wak" english_name="Wakashan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="wal" english_name="Walamo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="wln" english_name="Wallon" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="wa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="war" english_name="Waray" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="was" english_name="Washo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cym/wel" english_name="Galés" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="cy"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="wol" english_name="Wolof" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="wo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="xho" english_name="Xhosa" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="xh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sah" english_name="Yakut" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="yao" english_name="Yao" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="yap" english_name="Yap" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="yid" english_name="Yiddish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="yi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="yor" english_name="Yoruba" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="yo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="zap" english_name="Zapotec" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="zen" english_name="Zenaga" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="zha" english_name="Zhuang" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="za"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="zul" english_name="Zulú" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="zu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="zun" english_name="Zuni" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-04-03T20:37:24+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
-
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/Shortlistoflanguagenames_pl_PL.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/Shortlistoflanguagenames_pl_PL.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/Shortlistoflanguagenames_pl_PL.xml	(nonexistent)
@@ -1,213 +0,0 @@
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value="1-524b117b-c3fe-4355-b6d9-50e87036455f_Vm9jYWJ1bGFyeURTUmVzb3VyY2VzL1ZvY2FidWxhcnlEU1Jlc291cmNlVHlwZQ=="/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value=""/>
-        <DATE_OF_CREATION value="2008-03-11T16:29:38+01:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Short list of language names_pl_PL</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>ISO 639-2 list of languages. It defines mapping from iso639-1 and DRIVER derived values.</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM encoding="alb/sqi" english_name="albański" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sq"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ara" english_name="arabski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ar"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="baq/eus" english_name="baskijski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="eu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bul" english_name="bułgarski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bg"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bel" english_name="białoruski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="be"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="cat" english_name="kataloński" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ca"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="chi/zho" english_name="chiński" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="zh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="" english_name="chorwacki" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ces/cze" english_name="czeski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="cs"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="dan" english_name="duński" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="da"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="dut/nla" english_name="holenderski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="nl"/>
-                        <SYNONYM encoding="DRIVER" term="nl_nl"/>
-                        <SYNONYM encoding="DRIVER" term="nl_be"/>
-                        <SYNONYM encoding="DRIVER" term="nld"/>
-                        <SYNONYM encoding="DRIVER" term="dutdut"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="eng" english_name="angielski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="en"/>
-                        <SYNONYM encoding="DRIVER" term="english"/>
-                        <SYNONYM encoding="DRIVER" term="en_us"/>
-                        <SYNONYM encoding="DRIVER" term="en_en"/>
-                        <SYNONYM encoding="DRIVER" term="en_au"/>
-                        <SYNONYM encoding="DRIVER" term="en_nz"/>
-                        <SYNONYM encoding="DRIVER" term="en_gb"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="epo" english_name="esperanto" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="eo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="est" english_name="estoński" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="et"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="fin" english_name="fiński" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="fra/fre" english_name="francuski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fr"/>
-                        <SYNONYM encoding="DRIVER" term="fr_be"/>
-                        <SYNONYM encoding="DRIVER" term="fr_fr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="deu/ger" english_name="niemiecki" native_name="Deutsch">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="de"/>
-                        <SYNONYM encoding="iso639-1" term="german"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ell/gre" english_name="grecki" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="el"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="hun" english_name="węgierski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ice/isl" english_name="islandzki" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="is"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ita" english_name="włoski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="it"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="jpn" english_name="japoński" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ja"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lat" english_name="łacina" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="la"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mon" english_name="mongolski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mul" english_name="wiele języków" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nep" english_name="nepalski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ne"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="nor" english_name="norweski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="no"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="pol" english_name="polski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="por" english_name="portugalski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pt"/>
-                        <SYNONYM encoding="DRIVER" term="pt_pt"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ron/rum" english_name="rumuński" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ro"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="rus" english_name="rosyjski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ru"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="slk/slo" english_name="słowacki" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="slv" english_name="słoweński" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="esl/spa" english_name="hiszpański" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="es"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sve/swe" english_name="szwedzki" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sv"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="cym/wel" english_name="walijski" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="cy"/>
-                    </SYNONYMS>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2007-04-27T16:45:24+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/NamesofLanguages.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/NamesofLanguages.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/NamesofLanguages.xml	(nonexistent)
@@ -1,1534 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value="4-9a9666d9-be72-4e3b-9929-9b32a793500d_Vm9jYWJ1bGFyeURTUmVzb3VyY2VzL1ZvY2FidWxhcnlEU1Jlc291cmNlVHlwZQ=="/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value=""/>
-        <DATE_OF_CREATION value="2008-04-03T20:37:24+02:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Names of Languages</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>ISO 639-2 list of languages. It defines mapping from iso639-1 and DRIVER derived values.</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM encoding="abk" english_name="Abkhazian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="ab" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Achinese" encoding="ace">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Acoli" encoding="ach" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Adangme" native_name="" encoding="ada">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Afar" encoding="aar" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="aa" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="afh" english_name="Afrihili">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="afr" english_name="Afrikaans">
-                    <SYNONYMS>
-                        <SYNONYM term="af" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="afa" native_name="" english_name="Afro-Asiatic">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Akan" encoding="aka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="akk" english_name="Akkadian">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Albanian" encoding="alb/sqi">
-                    <SYNONYMS>
-                        <SYNONYM term="sq" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Aleut" native_name="" encoding="ale">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="alg" native_name="" english_name="Algonquian languages">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tut" english_name="Altaic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Amharic" encoding="amh">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="am"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="apa" native_name="" english_name="Apache">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Arabic" encoding="ara" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="ar" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Aramaic" native_name="" encoding="arc">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="arp" english_name="Arapaho" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="arn" english_name="Araucanian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="arw" native_name="" english_name="Arawak">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="arm/hye" native_name="" english_name="Armenian">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hy"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Artificial" native_name="" encoding="art">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Assamese" native_name="" encoding="asm">
-                    <SYNONYMS>
-                        <SYNONYM term="as" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ath" english_name="Athapascan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Austronesian" encoding="map">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Avaric" native_name="" encoding="ava">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Avestan" native_name="" encoding="ave">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="awa" english_name="Awadhi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="aym" native_name="" english_name="Aymara">
-                    <SYNONYMS>
-                        <SYNONYM term="ay" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Azerbaijani" encoding="aze">
-                    <SYNONYMS>
-                        <SYNONYM term="az" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Aztec" encoding="nah">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ban" native_name="" english_name="Balinese">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Baltic" encoding="bat">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Baluchi" encoding="bal">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bam" english_name="Bambara" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="bai" english_name="Bamileke">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="bad" english_name="Banda">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Bantu" native_name="" encoding="bnt">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bas" english_name="Basa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Bashkir" native_name="" encoding="bak">
-                    <SYNONYMS>
-                        <SYNONYM term="ba" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Basque" encoding="baq/eus">
-                    <SYNONYMS>
-                        <SYNONYM term="eu" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Beja" encoding="bej" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bem" native_name="" english_name="Bemba">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Bengali" encoding="ben" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="bn" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Berber" native_name="" encoding="ber">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Bhojpuri" encoding="bho" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Bihari" native_name="" encoding="bih">
-                    <SYNONYMS>
-                        <SYNONYM term="bh" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Bikol" native_name="" encoding="bik">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Bini" native_name="" encoding="bin">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="bis" english_name="Bislama">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bra" native_name="" english_name="Braj">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bre" native_name="" english_name="Breton">
-                    <SYNONYMS>
-                        <SYNONYM term="br" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bug" native_name="" english_name="Buginese">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Bulgarian" encoding="bul" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="bg" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bua" english_name="Buriat" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Burmese" encoding="bur/mya" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="my" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="bel" english_name="Byelorussian">
-                    <SYNONYMS>
-                        <SYNONYM term="be" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="cad" english_name="Caddo">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Carib" encoding="car">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="cat" english_name="Catalan">
-                    <SYNONYMS>
-                        <SYNONYM term="ca" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="cau" english_name="Caucasian">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Cebuano" encoding="ceb" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cel" native_name="" english_name="Celtic">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Central American Indian" encoding="cai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chg" english_name="Chagatai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="cha" english_name="Chamorro">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="che" english_name="Chechen" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Cherokee" native_name="" encoding="chr">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Cheyenne" native_name="" encoding="chy">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chb" english_name="Chibcha" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chi/zho" native_name="" english_name="Chinese">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="zh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Chinook jargon" native_name="" encoding="chn">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Choctaw" native_name="" encoding="cho">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Church Slavic" encoding="chu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chv" native_name="" english_name="Chuvash">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="cop" english_name="Coptic">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Cornish" native_name="" encoding="cor">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Corsican" encoding="cos">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="co"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Cree" native_name="" encoding="cre">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="mus" english_name="Creek">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="crp" english_name="Creoles and Pidgins">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="English-based Creoles and Pidgins" native_name="" encoding="cpe">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="French-based Creoles and Pidgins" encoding="cpf">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cpp" english_name="Portuguese-based Creoles and Pidgins" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Cushitic" encoding="cus">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="" english_name="Croatian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ces/cze" english_name="Czech" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="cs" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Dakota" native_name="" encoding="dak">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dan" english_name="Danish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="da" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="del" english_name="Delaware" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="din" english_name="Dinka">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Divehi" native_name="" encoding="div">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Dogri" encoding="doi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dra" native_name="" english_name="Dravidian">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Duala" encoding="dua" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Dutch" encoding="dut/nla">
-                    <SYNONYMS>
-                        <SYNONYM term="nl" encoding="iso639-1"/>
-                        <SYNONYM encoding="DRIVER" term="nl_nl"/>
-                        <SYNONYM term="nl_be" encoding="DRIVER"/>
-                        <SYNONYM term="nld" encoding="DRIVER"/>
-                        <SYNONYM encoding="DRIVER" term="dutdut"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="dum" english_name="Middle Dutch">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Dyula" encoding="dyu">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dzo" native_name="" english_name="Dzongkha">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="dz"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Efik" encoding="efi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="egy" english_name="Ancient Egyptian">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="eka" english_name="Ekajuk">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="elx" english_name="Elamite">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="eng" english_name="English">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="en"/>
-                        <SYNONYM encoding="DRIVER" term="english"/>
-                        <SYNONYM encoding="DRIVER" term="en_us"/>
-                        <SYNONYM term="en_en" encoding="DRIVER"/>
-                        <SYNONYM term="en_au" encoding="DRIVER"/>
-                        <SYNONYM term="en_nz" encoding="DRIVER"/>
-                        <SYNONYM term="en_gb" encoding="DRIVER"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Middle English" encoding="enm">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="ang" english_name="Old English">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Eskimo" native_name="" encoding="esk">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Esperanto" encoding="epo">
-                    <SYNONYMS>
-                        <SYNONYM term="eo" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Estonian" encoding="est" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="et" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Ewe" encoding="ewe">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Ewondo" encoding="ewo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="fan" english_name="Fang">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Fanti" native_name="" encoding="fat">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Faroese" encoding="fao" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Fijian" encoding="fij">
-                    <SYNONYMS>
-                        <SYNONYM term="fj" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="fin" native_name="" english_name="Finnish">
-                    <SYNONYMS>
-                        <SYNONYM term="fi" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Finno-Ugrian" encoding="fiu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fon" native_name="" english_name="Fon">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="French" encoding="fra/fre">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fr"/>
-                        <SYNONYM term="fr_be" encoding="DRIVER"/>
-                        <SYNONYM encoding="DRIVER" term="fr_fr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Middle French" native_name="" encoding="frm">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Old French" encoding="fro">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Frisian" encoding="fry">
-                    <SYNONYMS>
-                        <SYNONYM term="fy" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Fulah" encoding="ful">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Ga" encoding="gaa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="gae/gdh" english_name="Gaelic">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="glg" english_name="Gallegan">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="gl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="lug" english_name="Ganda">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="gay" english_name="Gayo">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Geez" native_name="" encoding="gez">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Georgian" native_name="" encoding="geo/kat">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ka"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="Deutsch" english_name="German" encoding="deu/ger">
-                    <SYNONYMS>
-                        <SYNONYM term="de" encoding="iso639-1"/>
-                        <SYNONYM term="german" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Middle High German" encoding="gmh" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="goh" native_name="" english_name="Old High German">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Germanic" encoding="gem">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="gil" english_name="Gilbertese">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Gondi" encoding="gon">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="got" native_name="" english_name="Gothic">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Grebo" encoding="grb" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Ancient Greek" native_name="" encoding="grc">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ell/gre" native_name="" english_name="Greek">
-                    <SYNONYMS>
-                        <SYNONYM term="el" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Greenlandic" encoding="kal">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="kl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="grn" english_name="Guarani" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="gn" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="guj" english_name="Gujarati">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="gu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Haida" encoding="hai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="hau" native_name="" english_name="Hausa">
-                    <SYNONYMS>
-                        <SYNONYM term="ha" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Hawaiian" encoding="haw" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Hebrew" encoding="heb" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="he"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="her" english_name="Herero">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Hiligaynon" native_name="" encoding="hil">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Himachali" encoding="him" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Hindi" encoding="hin">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Hiri Motu" encoding="hmo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="hun" native_name="" english_name="Hungarian">
-                    <SYNONYMS>
-                        <SYNONYM term="hu" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="hup" english_name="Hupa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="iba" english_name="Iban" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ice/isl" native_name="" english_name="Icelandic">
-                    <SYNONYMS>
-                        <SYNONYM term="is" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="ibo" english_name="Igbo">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Ijo" native_name="" encoding="ijo">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ilo" native_name="" english_name="Iloko">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="inc" english_name="Indic">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Indo-European" native_name="" encoding="ine">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Indonesian" encoding="ind">
-                    <SYNONYMS>
-                        <SYNONYM term="id" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Interlingua" encoding="ina">
-                    <SYNONYMS>
-                        <SYNONYM term="ia" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Interlingue" encoding="ine" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="-" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="iku" english_name="Inuktitut" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="iu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Inupiak" native_name="" encoding="ipk">
-                    <SYNONYMS>
-                        <SYNONYM term="ik" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Iranian" encoding="ira" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Irish" encoding="gai/iri" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="ga" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Irish" encoding="gle" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="old Irish" encoding="sga">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Middle Irish" encoding="mga">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Iroquoian" native_name="" encoding="iro">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Italian" encoding="ita">
-                    <SYNONYMS>
-                        <SYNONYM term="it" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Japanese" encoding="jpn" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ja"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="jav/jaw" english_name="Javanese">
-                    <SYNONYMS>
-                        <SYNONYM term="jv/jw" encoding="iso639-1"/>
-                        <SYNONYM term="jv" encoding="iso639-1"/>
-                        <SYNONYM encoding="iso639-1" term="jw"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="jrb" english_name="Judeo-Arabic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Judeo-Persian" encoding="jpr" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Kabyle" encoding="kab">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Kachin" native_name="" encoding="kac">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kam" native_name="" english_name="Kamba">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Kannada" encoding="kan">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="kn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Kanuri" encoding="kau" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="kaa" english_name="Kara-Kalpak">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kar" native_name="" english_name="Karen">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="kas" english_name="Kashmiri">
-                    <SYNONYMS>
-                        <SYNONYM term="ks" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Kawi" native_name="" encoding="kaw">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Kazakh" native_name="" encoding="kaz">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="kk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Khasi" native_name="" encoding="kha">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="khm" native_name="" english_name="Khmer">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="km"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Khoisan" encoding="khi">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Khotanese" encoding="kho">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kik" english_name="Kikuyu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Kinyarwanda" native_name="" encoding="kin">
-                    <SYNONYMS>
-                        <SYNONYM term="rw" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Kirghiz" encoding="kir">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ky"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="kom" english_name="Komi">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kon" native_name="" english_name="Kongo">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="kok" english_name="Konkani">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Korean" encoding="kor">
-                    <SYNONYMS>
-                        <SYNONYM term="ko" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Kpelle" encoding="kpe">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kro" english_name="Kru" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kua" native_name="" english_name="Kuanyama">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kum" native_name="" english_name="Kumyk">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kur" english_name="Kurdish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ku"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Kurukh" native_name="" encoding="kru">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kus" english_name="Kusaie" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="kut" english_name="Kutenai">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="lad" english_name="Ladino">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Lahnda" native_name="" encoding="lah">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Lamba" encoding="lam">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="oci" english_name="Langue d'Oc" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="oc" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lao" native_name="" english_name="Lao">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="lo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Latin" native_name="" encoding="lat">
-                    <SYNONYMS>
-                        <SYNONYM term="la" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="lav" english_name="Latvian">
-                    <SYNONYMS>
-                        <SYNONYM term="lv" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="ltz" english_name="Letzeburgesch">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="lez" english_name="Lezghian">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="lin" english_name="Lingala">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ln"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lit" native_name="" english_name="Lithuanian">
-                    <SYNONYMS>
-                        <SYNONYM term="lt" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="loz" english_name="Lozi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lub" native_name="" english_name="Luba-Katanga">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lui" english_name="Luiseno" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Lunda" encoding="lun" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="luo" native_name="" english_name="Luo">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Macedonian" encoding="mac/mak">
-                    <SYNONYMS>
-                        <SYNONYM term="mk" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Madurese" native_name="" encoding="mad">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Magahi" native_name="" encoding="mag">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Maithili" encoding="mai">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mak" native_name="" english_name="Makasar">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Malagasy" native_name="" encoding="mlg">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mg"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="may/msa" english_name="Malay" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ms"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mal" native_name="" english_name="Malayalam">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Maltese" native_name="" encoding="mlt">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ml"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="man" english_name="Mandingo">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mni" native_name="" english_name="Manipuri">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Manobo" encoding="mno" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="max" english_name="Manx" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Maori" encoding="mao/mri">
-                    <SYNONYMS>
-                        <SYNONYM term="mi" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="mar" english_name="Marathi">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Mari" encoding="chm" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mah" english_name="Marshall" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Marwari" encoding="mwr">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Masai" encoding="mas" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="myn" native_name="" english_name="Mayan">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="men" native_name="" english_name="Mende">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Micmac" encoding="mic">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="min" english_name="Minangkabau">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mis" native_name="" english_name="Miscellaneous">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="moh" english_name="Mohawk">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Moldavian" encoding="mol" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="mo" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Mon-Kmer" encoding="mkh">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lol" english_name="Mongo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mon" native_name="" english_name="Mongolian">
-                    <SYNONYMS>
-                        <SYNONYM term="mn" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="mos" english_name="Mossi">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mul" native_name="" english_name="Multiple languages">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Munda" encoding="mun">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Nauru" native_name="" encoding="nau">
-                    <SYNONYMS>
-                        <SYNONYM term="na" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="nav" native_name="" english_name="Navajo">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="nde" english_name="Ndebele">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="nbl" english_name="Ndebele">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Ndongo" encoding="ndo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Nepali" native_name="" encoding="nep">
-                    <SYNONYMS>
-                        <SYNONYM term="ne" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Newari" encoding="new">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Niger-Kordofanian" encoding="nic">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="ssa" english_name="Nilo-Saharan">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Niuean" encoding="niu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Norse" encoding="non">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nai" english_name="North American Indian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Norwegian" encoding="nor" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="no" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Ngomba" encoding="nno">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nub" english_name="Nubian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Nyamwezi" encoding="nym">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Nyanja" native_name="" encoding="nya">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Nyankole" encoding="nyn" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Nyoro" encoding="nyo">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nzi" native_name="" english_name="Nzima">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="oji" english_name="Ojibwa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Oriya" native_name="" encoding="ori">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="or"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="orm" english_name="Oromo" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="om" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="osa" english_name="Osage">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Ossetic" encoding="oss">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="oto" native_name="" english_name="Otomian">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Pahlavi" encoding="pal">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pau" native_name="" english_name="Palauan">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="pli" english_name="Pali">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Pampanga" native_name="" encoding="pam">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Pangasinan" encoding="pag">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Panjabi" encoding="pan">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="pap" english_name="Papiamento">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="paa" native_name="" english_name="Papuan-Australian">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fas/per" native_name="" english_name="Persian">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Persian, Old (ca 600 - 400 B.C.)" encoding="peo">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Phoenician" encoding="phn">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="pol" english_name="Polish">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="pon" native_name="" english_name="Ponape">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="por" english_name="Portuguese">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pt"/>
-                        <SYNONYM term="pt_pt" encoding="DRIVER"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Prakrit" encoding="pra">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Provencal" native_name="" encoding="pro">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pus" english_name="Pushto" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="ps" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Quechua" native_name="" encoding="que">
-                    <SYNONYMS>
-                        <SYNONYM term="qu" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Rhaeto-Romance" encoding="roh" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="rm"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Rajasthani" encoding="raj" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="rar" english_name="Rarotongan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Romance" encoding="roa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="ron/rum" english_name="Romanian">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ro"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Romany" native_name="" encoding="rom">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="run" english_name="Rundi">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="rn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="rus" english_name="Russian">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ru"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Salishan" native_name="" encoding="sal">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Samaritan" encoding="sam">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Sami" native_name="" encoding="smi">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Samoan" encoding="smo">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sm"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sad" native_name="" english_name="Sandawe">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="sag" english_name="Sango">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sg"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Sanskrit" native_name="" encoding="san">
-                    <SYNONYMS>
-                        <SYNONYM term="sa" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Sardinian" native_name="" encoding="srd">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Scots" encoding="sco">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Selkup" encoding="sel">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sem" english_name="Semitic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="" english_name="Serbian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="sr" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="scr" english_name="Serbo-Croatian">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="srr" english_name="Serbian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Shan" encoding="shn">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sna" english_name="Shona" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="sn" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sid" english_name="Sidamo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Siksika" encoding="bla" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Sindhi" encoding="snd">
-                    <SYNONYMS>
-                        <SYNONYM term="sd" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="sin" english_name="Singhalese">
-                    <SYNONYMS>
-                        <SYNONYM term="si" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Sino-Tibetan" native_name="" encoding="sit">
-                    <SYNONYMS>
-                        <SYNONYM term="-" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Siouan" native_name="" encoding="sio">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sla" native_name="" english_name="Slavic">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Siswant" encoding="ssw" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ss"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="slk/slo" english_name="Slovak">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="slv" english_name="Slovenian">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Sogdian" native_name="" encoding="sog">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Somali" native_name="" encoding="som">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="so"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Songhai" native_name="" encoding="son">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="wen" english_name="Sorbian">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nso" english_name="Sotho" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sot" english_name="Sotho" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="st"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sai" english_name="South American Indian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Spanish" encoding="esl/spa" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="es" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="suk" english_name="Sukuma">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Sumerian" encoding="sux">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Sudanese" encoding="sun" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="su"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sus" english_name="Susu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Swahili" native_name="" encoding="swa">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sw"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ssw" native_name="" english_name="Swazi">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Swedish" encoding="sve/swe">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sv"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="syr" english_name="Syriac">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tgl" english_name="Tagalog" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Tahitian" encoding="tah">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Tajik" native_name="" encoding="tgk">
-                    <SYNONYMS>
-                        <SYNONYM term="tg" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Tamashek" native_name="" encoding="tmh">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Tamil" native_name="" encoding="tam">
-                    <SYNONYMS>
-                        <SYNONYM term="ta" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="tat" english_name="Tatar">
-                    <SYNONYMS>
-                        <SYNONYM term="tt" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Telugu" encoding="tel" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="te"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ter" native_name="" english_name="Tereno">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="tha" english_name="Thai">
-                    <SYNONYMS>
-                        <SYNONYM term="th" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Tibetan" native_name="" encoding="bod/tib">
-                    <SYNONYMS>
-                        <SYNONYM term="bo" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Tigre" encoding="tig">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tir" native_name="" english_name="Tigrinya">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ti"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Timne" encoding="tem">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Tivi" native_name="" encoding="tiv">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Tlingit" native_name="" encoding="tli">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Tonga(Nyasa)" encoding="tog" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="to" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="ton" english_name="Tonga(Tonga Islands)">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tru" native_name="" english_name="Truk">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Tsimshian" native_name="" encoding="tsi">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Tsonga" encoding="tso" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="ts" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Tswana" encoding="tsn">
-                    <SYNONYMS>
-                        <SYNONYM term="tn" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tum" english_name="Tumbuka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Turkish" native_name="" encoding="tur">
-                    <SYNONYMS>
-                        <SYNONYM term="tr" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ota" english_name="Ottoman" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Turkmen" native_name="" encoding="tuk">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Tuvinian" native_name="" encoding="tyv">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Twi" native_name="" encoding="twi">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tw"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="uga" english_name="Ugaritic">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Uighur" encoding="uig">
-                    <SYNONYMS>
-                        <SYNONYM term="ug" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ukr" native_name="" english_name="Ukrainian">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="uk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="umb" native_name="" english_name="Umbundu">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Undetermined" encoding="und" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Urdu" native_name="" encoding="urd">
-                    <SYNONYMS>
-                        <SYNONYM term="ur" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="uzb" english_name="Uzbek">
-                    <SYNONYMS>
-                        <SYNONYM term="uz" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Vai" encoding="vai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ven" native_name="" english_name="Venda">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Vietnamese" encoding="vie">
-                    <SYNONYMS>
-                        <SYNONYM term="vi" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="VolapÃƒÂ¼k" native_name="" encoding="vol">
-                    <SYNONYMS>
-                        <SYNONYM term="vo" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Votic" encoding="vot" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Wakashan" encoding="wak">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="wal" english_name="Walamo">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="wln" english_name="Wallon">
-                    <SYNONYMS>
-                        <SYNONYM term="wa" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Waray" native_name="" encoding="war">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Washo" native_name="" encoding="was">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cym/wel" english_name="Welsh" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="cy" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Wolof" native_name="" encoding="wol">
-                    <SYNONYMS>
-                        <SYNONYM term="wo" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="xho" native_name="" english_name="Xhosa">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="xh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Yakut" encoding="sah" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Yao" encoding="yao">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Yap" encoding="yap">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="yid" english_name="Yiddish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="yi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Yoruba" encoding="yor" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="yo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Zapotec" encoding="zap" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="zen" native_name="" english_name="Zenaga">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="zha" native_name="" english_name="Zhuang">
-                    <SYNONYMS>
-                        <SYNONYM term="za" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Zulu" native_name="" encoding="zul">
-                    <SYNONYMS>
-                        <SYNONYM term="zu" encoding="iso639-1"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="zun" english_name="Zuni" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-04-03T20:37:24+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/Namesof TextObjectTypologies_es_ES.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/Namesof TextObjectTypologies_es_ES.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/Namesof TextObjectTypologies_es_ES.xml	(nonexistent)
@@ -1,112 +0,0 @@
-<RESOURCE_PROFILE xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <HEADER>
-        <RESOURCE_IDENTIFIER value="10a89de8-8f16-4e8c-824c-f76646438fa6_Vm9jYWJ1bGFyeURTUmVzb3VyY2VzL1ZvY2FidWxhcnlEU1Jlc291cmNlVHlwZQ=="/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2010-12-23T19:05:23+01:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Names of Text Object Typologies_es_ES</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>List of typology types provided by the DRIVER Guidelines for Repository content</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM encoding="0000" english_name="Desconocido" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0001" english_name="Artículo" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVER" term="Article in monograph or in proceedings"/>
-                        <SYNONYM encoding="DRIVER" term="Article/Letter to editor"/>
-                        <SYNONYM encoding="DRIVER" term="Article / Letter to the editor"/>
-                        <SYNONYM encoding="DRIVER" term="Article / Letter to editor"/>
-                        <SYNONYM encoding="DRIVER" term="Article-letter to the editor"/>
-                        <SYNONYM encoding="DRIVER" term="Article - letter to the editor"/>
-                        <SYNONYM encoding="DRIVER" term="Journal article"/>
-                        <SYNONYM encoding="DRIVER" term="Journal article (on-line or printed)"/>
-                        <SYNONYM encoding="DRIVER" term="Peer-reviewed Article"/>
-                        <SYNONYM encoding="DRIVER" term="Article / Newspaper"/>
-                        <SYNONYM encoding="DRIVER" term="Aufsatz"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0002" english_name="Libro" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVER" term="Book (monograph)"/>
-                        <SYNONYM encoding="DRIVER" term="Book - monograph - editorial book"/>
-                        <SYNONYM encoding="DRIVER" term="Book Section"/>
-                        <SYNONYM encoding="DRIVER" term="Monograph"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0003" english_name="Lectura de Conferencia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0004" english_name="Informe de Conferencia" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVER" term="Conference or Workshop Item"/>
-                        <SYNONYM encoding="DRIVER" term="Conference Paper"/>
-                        <SYNONYM encoding="DRIVER" term="Conference contribution"/>
-                        <SYNONYM encoding="DRIVER" term="Conference Paper"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0005" english_name="Contribución a periódico o pulicación semanal" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0006" english_name="Tesis doctoral" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DINI" term="Text.Thesis.Doctoral"/>
-                        <SYNONYM encoding="DRIVER" term="Thesis.Doctoral"/>
-                        <SYNONYM encoding="DRIVER" term="Dissertation"/>
-                        <SYNONYM encoding="DRIVER" term="Diss"/>
-                        <SYNONYM encoding="DRIVER" term="DoctoralThesis"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0007" english_name="Tesis de Master" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DINI" term="Masters-Thesis.Magister"/>
-                        <SYNONYM encoding="DRIVER" term="Thesis.Master"/>
-                        <SYNONYM encoding="DRIVER" term="Masters thesis"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0008" english_name="Proyecto fin de carrera" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0009" english_name="Informe de Investigación Externo" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DINI" term="Tech-Report"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0010" english_name="Lectura" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DINI" term="Public-Lecture"/>
-                        <SYNONYM encoding="DRIVER" term="Inaugural lecture"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0011" english_name="Informe Interno" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0012" english_name="Noticia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0013" english_name="Parte de Libro o Capítulo de Libro" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVER" term="Part of book - chapter"/>
-                        <SYNONYM encoding="DRIVER" term="Book editorial"/>
-                        <SYNONYM encoding="DRIVER" term="Book section"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0014" english_name="Trabajo de Investigación" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DINI" term="Research-Paper"/>
-                        <SYNONYM encoding="DINI" term="Paper"/>
-                        <SYNONYM encoding="DINI" term="ResearchPaper"/>
-                    </SYNONYMS>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2007-05-06T23:02:07+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS/>
-    </BODY>
-</RESOURCE_PROFILE>
-
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/NamesofCountries_es_ES.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/NamesofCountries_es_ES.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/NamesofCountries_es_ES.xml	(nonexistent)
@@ -1,757 +0,0 @@
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value="e540db9e-768a-4c75-8f37-5d0f8d0f3115_Vm9jYWJ1bGFyeURTUmVzb3VyY2VzL1ZvY2FidWxhcnlEU1Jlc291cmNlVHlwZQ=="/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2010-12-23T19:12:24+01:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Names of Countries_es_ES</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>OASIS list of country codes Country Code List: ISO 3166-1993 (E). No mappings provided.</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM encoding="AD" english_name="Andorra" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AE" english_name="Emiratos Árabes Unidos" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AF" english_name="Afganistán" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AG" english_name="Antigua y Barbuda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AI" english_name="Anguila" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AL" english_name="Albania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AM" english_name="Armenia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AN" english_name="Antillas Holandesas" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AO" english_name="Angola" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AQ" english_name="Antartida" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AR" english_name="Argentina" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AS" english_name="Samoa Americana" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AT" english_name="Austria" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AU" english_name="Australia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AW" english_name="Aruba" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AZ" english_name="Azerbaiyán" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BA" english_name="Bosnia y Herzegovina" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BB" english_name="Barbados" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BD" english_name="Bangladesh" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BE" english_name="Bélgica" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BF" english_name="Burkina Faso" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BG" english_name="Bulgaria" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BH" english_name="Bahréin" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BI" english_name="Burundi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BJ" english_name="Benín" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BM" english_name="Bermudas" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BN" english_name="Brunéi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BO" english_name="Bolivia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BR" english_name="Brasil" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BS" english_name="Bahamas" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BT" english_name="Bután" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BU" english_name="Birmania (ya no existe)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BV" english_name="Isla Bouvet" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BW" english_name="Botsuana" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BY" english_name="Bielorrusia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BZ" english_name="Belice" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CA" english_name="Canada" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CC" english_name="Islas Cocos (Keeling)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CF" english_name="República Centroafricana" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CG" english_name="República del Congo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CH" english_name="Suiza" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CI" english_name="Costa de Marfil" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CK" english_name="Islas Cook" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CL" english_name="Chile" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CM" english_name="Camerún" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CN" english_name="China" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CO" english_name="Colombia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CR" english_name="Costa Rica" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CS" english_name="Checoslovaquia (ya no existe)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CU" english_name="Cuba" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CV" english_name="Cabo Verde" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CX" english_name="Isla de Navidad" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CY" english_name="Chipre" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CZ" english_name="República Checa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DD" english_name="República Democrática Alemana (ya no existe)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DE" english_name="Alemania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DJ" english_name="Yibuti" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DK" english_name="Dinamarca" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DM" english_name="Dominica" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DO" english_name="República Dominicana" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DZ" english_name="Argelia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="EC" english_name="Ecuador" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="EE" english_name="Estonia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="EG" english_name="Egipto" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="EH" english_name="Sahara Occidental" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ER" english_name="Eritrea" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ES" english_name="España" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ET" english_name="Etiopía" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FI" english_name="Finlandia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FJ" english_name="Fiyi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FK" english_name="Islas Malvinas" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FM" english_name="Estados Federados de Micronesia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FO" english_name="Islas Feroe" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FR" english_name="Francia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FX" english_name="Francia, Metropolitana" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GA" english_name="Gabón" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UK" english_name="Reino Unido" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GD" english_name="Granada" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GE" english_name="Georgia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GF" english_name="Guayana Francesa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GH" english_name="Ghana" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GI" english_name="Gibraltar" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GL" english_name="Groenlandia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GM" english_name="Gambia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GN" english_name="Guinea" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GP" english_name="Guadalupe" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GQ" english_name="Guinea Ecuatorial" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GR" english_name="Grecia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GS" english_name="Islas Georgias del Sur y Sandwich del Sur " native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GT" english_name="Guatemala" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GU" english_name="Guam" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GW" english_name="Guinea-Bissau" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GY" english_name="Guyana" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HK" english_name="Hong Kong" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HM" english_name="Islas Heard y McDonald" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HN" english_name="Honduras" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HR" english_name="Croacia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HT" english_name="Haiti" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HU" english_name="Hungría" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ID" english_name="Indonesia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IE" english_name="Irlanda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IL" english_name="Israel" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IN" english_name="India" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IO" english_name="Territorio Británico del Océano Índico" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IQ" english_name="Irak" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IR" english_name="República Islámica de Irán" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IS" english_name="Islandia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IT" english_name="Italia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="JM" english_name="Jamaica" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="JO" english_name="Jordania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="JP" english_name="Japón" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KE" english_name="Kenia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KG" english_name="Kirguistán" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KH" english_name="Camboya" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KI" english_name="Kiribati" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KM" english_name="Comoras" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KN" english_name="San Cristóbal y Nieves" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KP" english_name="República Popular Democrática de Corea" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KR" english_name="República de Corea" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KW" english_name="Kuwait" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KY" english_name="Islas Cayman" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KZ" english_name="Kazajistán" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LA" english_name="República Democrática Popular Lao" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LB" english_name="Líbano" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LC" english_name="Santa Lucía" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LI" english_name="Liechtenstein" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LK" english_name="Sri Lanka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LR" english_name="Liberia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LS" english_name="Lesotho" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LT" english_name="Lituania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LU" english_name="Luxemburgo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LV" english_name="Letonia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="LY" english_name="Libia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MA" english_name="Marruecos" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MC" english_name="Mónaco" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MD" english_name="República de Moldavia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MG" english_name="Madagascar" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MH" english_name="Islas Marshall" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ML" english_name="Mali" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MN" english_name="Mongolia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MM" english_name="Myanmar" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MO" english_name="Macao" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MP" english_name="Islas Marianas del Norte" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MQ" english_name="Martinica" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MR" english_name="Mauritania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MS" english_name="Monserrat" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MT" english_name="Malta" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MU" english_name="Mauritania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MV" english_name="Maldivas" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MW" english_name="Malaui" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MX" english_name="México" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MY" english_name="Malasia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MZ" english_name="Mozambique" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NA" english_name="Namibia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NC" english_name="Nueva Caledonia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NE" english_name="Níger" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NF" english_name="Isla Norfolk" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NG" english_name="República Federal de Nigeria" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NI" english_name="Nicaragua" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NL" english_name="Países Bajos" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NO" english_name="Noruega" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NP" english_name="Nepal" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NR" english_name="República de Nauru" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NT" english_name="Zona neutral saudí-iraquí (ya no existe)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NU" english_name="Niue" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NZ" english_name="Nueva Zelanda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="OM" english_name="Omán" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PA" english_name="Panamá" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PE" english_name="Perú" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PF" english_name="Polinesia Francesa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PG" english_name="Papúa Nueva Guinea" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PH" english_name="Filipinas" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PK" english_name="Pakistán" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PL" english_name="Polonia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PM" english_name="San Pedro y Miguelón" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PN" english_name="Islas Pitcairn" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PR" english_name="Puerto Rico" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PT" english_name="Portugal" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PW" english_name="Palaos" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PY" english_name="Paraguay" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="QA" english_name="Qatar" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="RE" english_name="Reunión" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="RO" english_name="Rumanía" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="RU" english_name="Federación de Rusia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="RW" english_name="Ruanda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SA" english_name="Arabia Saudí" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SB" english_name="Islas Salomón" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SC" english_name="República de las Seychelles" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SD" english_name="Sudán" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SE" english_name="Suecia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SG" english_name="Singapur" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SH" english_name="Santa Helena" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SI" english_name="Eslovenia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SJ" english_name="Svalbard y Jan Mayen" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SK" english_name="Eslovaquia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SL" english_name="Sierra Leona" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SM" english_name="San Marino" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SN" english_name="Senegal" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SO" english_name="Somalia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SR" english_name="Surinam" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ST" english_name="Santo Tomé y Príncipe" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SU" english_name="Unión de Repúblicas Socialistas Soviéticas (ya no existe)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SV" english_name="El Salvador" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SY" english_name="República Árabe Siria" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SZ" english_name="Suazilandia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TC" english_name="Islas Turcas y Caicos" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TD" english_name="Chad" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TF" english_name="Tierras Australes y Antárticas Francesas" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TG" english_name="Togo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TH" english_name="Tailandia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TJ" english_name="Tayikistán" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TK" english_name="Tokelau" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TM" english_name="Turkmenistán" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TN" english_name="Túnez" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TO" english_name="Tonga" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TP" english_name="Timor Oriental" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TR" english_name="Turquía" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TT" english_name="Trinidad y Tobago" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TV" english_name="Tuvalu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TW" english_name="República de China (Taiwán)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TZ" english_name="República Unida de Tanzania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UA" english_name="Ucrania" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UG" english_name="Uganda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UM" english_name="Islas Ultramarinas de Estados Unidos" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="US" english_name="Estados Unidos de América" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UY" english_name="Uruguay" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UZ" english_name="Uzbekistán" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VA" english_name="Estado de la Ciudad del Vaticano" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VC" english_name="San Vicente y las Granadinas" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VE" english_name="Venezuela" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VG" english_name="Islas Vírgenes Británicas" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VI" english_name="Islas Vírgenes de los Estados Unidos" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VN" english_name="Vietnam" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VU" english_name="Vanuatu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="WF" english_name="Wallis y Futuna" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="WS" english_name="Samoa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="YD" english_name="Yemen del Sur (ya no existe)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="YE" english_name="Yemen" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="YT" english_name="Mayotte" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="YU" english_name="Yugoslavia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ZA" english_name="Sudáfrica" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ZM" english_name="Zambia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CD" english_name="República Democrática del Congo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ZW" english_name="Zimbabue" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ZZ" english_name="País desconocido o no especificado" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-06-25T14:50:49+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
-
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/Namesof TextObjectTypologies.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/Namesof TextObjectTypologies.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/Namesof TextObjectTypologies.xml	(nonexistent)
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <HEADER>
-        <RESOURCE_IDENTIFIER value="5-67454a39-107f-4678-8db6-d08f53f28ea2_Vm9jYWJ1bGFyeURTUmVzb3VyY2VzL1ZvY2FidWxhcnlEU1Jlc291cmNlVHlwZQ=="/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2008-02-06T11:32:53+01:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Names of Text Object Typologies</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>List of typology types provided by the DRIVER Guidelines for Repository content</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM native_name="" encoding="0000" english_name="Unknown">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Article" encoding="0001">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVER" term="Article in monograph or in proceedings"/>
-                        <SYNONYM encoding="DRIVER" term="Article/Letter to editor"/>
-                        <SYNONYM term="Article / Letter to the editor" encoding="DRIVER"/>
-                        <SYNONYM term="Article / Letter to editor" encoding="DRIVER"/>
-                        <SYNONYM encoding="DRIVER" term="Article-letter to the editor"/>
-                        <SYNONYM term="Article - letter to the editor" encoding="DRIVER"/>
-                        <SYNONYM term="Journal article" encoding="DRIVER"/>
-                        <SYNONYM term="Journal article (on-line or printed)" encoding="DRIVER"/>
-                        <SYNONYM encoding="DRIVER" term="Peer-reviewed Article"/>
-                        <SYNONYM term="Article / Newspaper" encoding="DRIVER"/>
-                        <SYNONYM term="Aufsatz" encoding="DRIVER"/>
-                        <SYNONYM encoding="DRIVERGuidelinesV2" term="info:eu-repo/semantics/article"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0002" native_name="" english_name="Book">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVER" term="Book (monograph)"/>
-                        <SYNONYM encoding="DRIVER" term="Book - monograph - editorial book"/>
-                        <SYNONYM term="Book Section" encoding="DRIVER"/>
-                        <SYNONYM encoding="DRIVER" term="Monograph"/>
-                        <SYNONYM encoding="DRIVERGuidelinesV2" term="info:eu-repo/semantics/book"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="0004" english_name="Conference object">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVER" term="Conference or Workshop Item"/>
-                        <SYNONYM encoding="DRIVER" term="Conference Paper"/>
-                        <SYNONYM term="Conference contribution" encoding="DRIVER"/>
-                        <SYNONYM term="Conference lecture" encoding="DRIVER"/>
-                        <SYNONYM encoding="DRIVER" term="Conference report"/>
-                        <SYNONYM encoding="DRIVERGuidelinesV2" term="info:eu-repo/semantics/conferenceObject"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Contribution for newspaper or weekly magazine" native_name="" encoding="0005">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVERGuidelinesV2" term="info:eu-repo/semantics/contributionToPeriodical"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0006" english_name="Doctoral thesis" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="Text.Thesis.Doctoral" encoding="DINI"/>
-                        <SYNONYM term="Thesis.Doctoral" encoding="DRIVER"/>
-                        <SYNONYM encoding="DRIVER" term="Dissertation"/>
-                        <SYNONYM term="Diss" encoding="DRIVER"/>
-                        <SYNONYM encoding="DRIVER" term="DoctoralThesis"/>
-                        <SYNONYM encoding="DRIVERGuidelinesV2" term="info:eu-repo/semantics/doctoralThesis"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0007" english_name="Master thesis" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DINI" term="Masters-Thesis.Magister"/>
-                        <SYNONYM term="Thesis.Master" encoding="DRIVER"/>
-                        <SYNONYM encoding="DRIVER" term="Masters thesis"/>
-                        <SYNONYM encoding="DRIVERGuidelinesV2" term="info:eu-repo/semantics/masterThesis"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Bachelor thesis" encoding="0008">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVERGuidelinesV2" term="info:eu-repo/semantics/bachelorThesis"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0009" english_name="External research report" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="Tech-Report" encoding="DINI"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0010" english_name="Lecture" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM term="Public-Lecture" encoding="DINI"/>
-                        <SYNONYM term="Inaugural lecture" encoding="DRIVER"/>
-                        <SYNONYM term="info:eu-repo/semantics/lecture" encoding="DRIVERGuidelinesV2"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="0011" english_name="Internal report">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="0012" english_name="Newsletter">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="0013" english_name="Part of book or chapter of book" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVER" term="Part of book - chapter"/>
-                        <SYNONYM encoding="DRIVER" term="Book editorial"/>
-                        <SYNONYM encoding="DRIVER" term="Book section"/>
-                        <SYNONYM term="info:eu-repo/semantics/bookPart" encoding="DRIVERGuidelinesV2"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Research paper" native_name="" encoding="0014">
-                    <SYNONYMS>
-                        <SYNONYM term="Research-Paper" encoding="DINI"/>
-                        <SYNONYM term="Paper" encoding="DINI"/>
-                        <SYNONYM term="ResearchPaper" encoding="DINI"/>
-                        <SYNONYM encoding="DRIVERGuidelinesV2" term="info:eu-repo/semantics/workingPaper"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Review" native_name="" encoding="0015">
-                    <SYNONYMS>
-                        <SYNONYM term="info:eu-repo/semantics/review" encoding="DRIVERGuidelinesV2"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM english_name="Preprint" native_name="" encoding="0016">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVERGuidelinesV2" term="info:eu-repo/semantics/preprint"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="0017" english_name="Report">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVERGuidelinesV2" term="info:eu-repo/semantics/report"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" encoding="0018" english_name="Annotation">
-                    <SYNONYMS>
-                        <SYNONYM term="info:eu-repo/semantics/annotation" encoding="DRIVERGuidelinesV2"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="0019" english_name="Patent" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVERGuidelinesV2" term="info:eu-repo/semantics/patent"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM native_name="" english_name="Other" encoding="0020">
-                    <SYNONYMS>
-                        <SYNONYM encoding="DRIVERGuidelinesV2" term="info:eu-repo/semantics/other"/>
-                    </SYNONYMS>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2007-05-06T23:02:07+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS/>
-    </BODY>
-</RESOURCE_PROFILE>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/NamesofCountries.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/NamesofCountries.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/NamesofCountries.xml	(nonexistent)
@@ -1,763 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value="3-959aed5b-9ccc-40ff-9791-352d05098cdd_Vm9jYWJ1bGFyeURTUmVzb3VyY2VzL1ZvY2FidWxhcnlEU1Jlc291cmNlVHlwZQ=="/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2008-06-25T14:50:49+02:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Names of Countries</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>OASIS list of country codes Country Code List: ISO 3166-1993 (E). No mappings provided.</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM encoding="AD" english_name="Andorra" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AE" native_name="" english_name="United Arab Emirates">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AF" english_name="Afghanistan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="AG" english_name="Antigua &amp; Barbuda">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="AI" english_name="Anguilla">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Albania" native_name="" encoding="AL">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Armenia" encoding="AM">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Netherlands Antilles" encoding="AN" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Angola" native_name="" encoding="AO">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="AQ" english_name="Antarctica">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Argentina" encoding="AR" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="American Samoa" native_name="" encoding="AS">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AT" native_name="" english_name="Austria">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Australia" encoding="AU">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Aruba" encoding="AW">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="AZ" native_name="" english_name="Azerbaijan">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Bosnia and Herzegovina" encoding="BA" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="BB" english_name="Barbados">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Bangladesh" native_name="" encoding="BD">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Belgium" encoding="BE" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BF" english_name="Burkina Faso" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BG" english_name="Bulgaria" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="BH" english_name="Bahrain">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BI" native_name="" english_name="Burundi">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="BJ" english_name="Benin">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="BM" english_name="Bermuda">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BN" native_name="" english_name="Brunei Darussalam">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Bolivia" encoding="BO">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="BR" english_name="Brazil">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BS" english_name="Bahama" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BT" native_name="" english_name="Bhutan">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BU" native_name="" english_name="Burma (no longer exists)">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Bouvet Island" native_name="" encoding="BV">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Botswana" native_name="" encoding="BW">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="BY" native_name="" english_name="Belarus">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Belize" native_name="" encoding="BZ">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Canada" encoding="CA" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CC" english_name="Cocos (Keeling) Islands" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Central African Republic" encoding="CF" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Congo" encoding="CG">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Switzerland" encoding="CH">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="C&amp;ocirc;te D'ivoire (Ivory Coast)" native_name="" encoding="CI">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Cook Islands" native_name="" encoding="CK">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CL" english_name="Chile" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CM" native_name="" english_name="Cameroon">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CN" english_name="China" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Colombia" encoding="CO">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Costa Rica" native_name="" encoding="CR">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Czechoslovakia (no longer exists)" encoding="CS">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Cuba" encoding="CU">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CV" english_name="Cape Verde" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="CX" native_name="" english_name="Christmas Island">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Cyprus" encoding="CY">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Czech Republic" encoding="CZ">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="German Democratic Republic (no longer exists)" encoding="DD" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DE" english_name="Germany" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="DJ" native_name="" english_name="Djibouti">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="DK" english_name="Denmark">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Dominica" encoding="DM">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Dominican Republic" encoding="DO">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Algeria" encoding="DZ" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Ecuador" encoding="EC" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Estonia" encoding="EE">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="EG" english_name="Egypt">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Western Sahara" encoding="EH" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Eritrea" native_name="" encoding="ER">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ES" native_name="" english_name="Spain">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Ethiopia" encoding="ET" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="FI" english_name="Finland">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Fiji" encoding="FJ">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Falkland Islands (Malvinas)" native_name="" encoding="FK">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FM" native_name="" english_name="Micronesia">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="FO" native_name="" english_name="Faroe Islands">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="France" encoding="FR" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="France, Metropolitan" native_name="" encoding="FX">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GA" english_name="Gabon" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="UK" native_name="" english_name="United Kingdom (Great Britain)">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GD" native_name="" english_name="Grenada">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GE" native_name="" english_name="Georgia">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="GF" english_name="French Guiana">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GH" native_name="" english_name="Ghana">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GI" english_name="Gibraltar" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Greenland" encoding="GL" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="GM" english_name="Gambia">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Guinea" encoding="GN">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Guadeloupe" native_name="" encoding="GP">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Equatorial Guinea" encoding="GQ" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="GR" english_name="Greece">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="South Georgia and the South Sandwich Islands" native_name="" encoding="GS">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GT" native_name="" english_name="Guatemala">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Guam" native_name="" encoding="GU">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GW" english_name="Guinea-Bissau" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="GY" english_name="Guyana" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="HK" english_name="Hong Kong">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Heard &amp; McDonald Islands" native_name="" encoding="HM">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Honduras" native_name="" encoding="HN">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Croatia" encoding="HR">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="HT" english_name="Haiti">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="HU" native_name="" english_name="Hungary">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ID" english_name="Indonesia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="IE" english_name="Ireland">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IL" english_name="Israel" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="India" encoding="IN">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="IO" english_name="British Indian Ocean Territory">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Iraq" native_name="" encoding="IQ">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Islamic Republic of Iran" encoding="IR" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Iceland" encoding="IS" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="IT" native_name="" english_name="Italy">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="JM" native_name="" english_name="Jamaica">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Jordan" encoding="JO">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Japan" encoding="JP">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="KE" english_name="Kenya">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Kyrgyzstan" native_name="" encoding="KG">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Cambodia" native_name="" encoding="KH">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KI" english_name="Kiribati" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KM" native_name="" english_name="Comoros">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="St. Kitts and Nevis" encoding="KN">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Korea, Democratic People's Republic of" native_name="" encoding="KP">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KR" english_name="Korea, Republic of" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="KW" native_name="" english_name="Kuwait">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Cayman Islands" encoding="KY">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Kazakhstan" native_name="" encoding="KZ">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Lao People's Democratic Republic" encoding="LA">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Lebanon" encoding="LB">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Saint Lucia" native_name="" encoding="LC">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Liechtenstein" encoding="LI">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Sri Lanka" encoding="LK">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Liberia" encoding="LR">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Lesotho" native_name="" encoding="LS">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Lithuania" encoding="LT" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Luxembourg" native_name="" encoding="LU">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Latvia" native_name="" encoding="LV">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Libyan Arab Jamahiriya" encoding="LY" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="MA" english_name="Morocco">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MC" english_name="Monaco" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MD" native_name="" english_name="Moldova, Republic of">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Madagascar" encoding="MG">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Madagascar" native_name="" encoding="MG">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Marshall Islands" encoding="MH">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="ML" english_name="Mali">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Mongolia" encoding="MN">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="MM" english_name="Myanmar">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MO" native_name="" english_name="Macau">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MP" native_name="" english_name="Northern Mariana Islands">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MQ" native_name="" english_name="Martinique">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MR" native_name="" english_name="Mauritania">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Monserrat" encoding="MS" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Malta" native_name="" encoding="MT">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Mauritius" encoding="MU">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MV" native_name="" english_name="Maldives">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="MW" english_name="Malawi">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Mexico" encoding="MX" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MY" native_name="" english_name="Malaysia">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="MZ" english_name="Mozambique" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="NA" english_name="Namibia">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="NC" english_name="New Caledonia">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="NE" english_name="Niger">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NF" native_name="" english_name="Norfolk Island">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="NG" english_name="Nigeria">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="NI" english_name="Nicaragua">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="NL" english_name="Netherlands">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Norway" encoding="NO">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="NP" english_name="Nepal">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NR" native_name="" english_name="Nauru">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Neutral Zone (no longer exists)" native_name="" encoding="NT">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="NU" native_name="" english_name="Niue">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="New Zealand" encoding="NZ">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Oman" native_name="" encoding="OM">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Panama" native_name="" encoding="PA">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PE" english_name="Peru" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PF" english_name="French Polynesia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PG" native_name="" english_name="Papua New Guinea">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Philippines" encoding="PH">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Pakistan" encoding="PK">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Poland" native_name="" encoding="PL">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="PM" english_name="St. Pierre &amp; Miquelon">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Pitcairn" native_name="" encoding="PN">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PR" native_name="" english_name="Puerto Rico">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PT" english_name="Portugal" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PW" native_name="" english_name="Palau">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="PY" native_name="" english_name="Paraguay">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="QA" english_name="Qatar">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="R&amp;eacute;union" native_name="" encoding="RE">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="RO" english_name="Romania">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="RU" native_name="" english_name="Russian Federation">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Rwanda" native_name="" encoding="RW">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SA" english_name="Saudi Arabia" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="SB" english_name="Solomon Islands">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Seychelles" encoding="SC">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SD" english_name="Sudan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Sweden" encoding="SE" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SG" english_name="Singapore" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="St. Helena" encoding="SH">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Slovenia" encoding="SI">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SJ" english_name="Svalbard &amp; Jan Mayen Islands" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Slovakia" encoding="SK" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Sierra Leone" encoding="SL">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SM" native_name="" english_name="San Marino">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="SN" native_name="" english_name="Senegal">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Somalia" encoding="SO" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Suriname" encoding="SR">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Sao Tome &amp; Principe" native_name="" encoding="ST">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Union of Soviet Socialist Republics (no longer exists)" encoding="SU">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="SV" english_name="El Salvador">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Syrian Arab Republic" encoding="SY">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Swaziland" encoding="SZ">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TC" english_name="Turks &amp; Caicos Islands" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Chad" native_name="" encoding="TD">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="French Southern Territories" native_name="" encoding="TF">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TG" native_name="" english_name="Togo">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Thailand" encoding="TH">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="TJ" english_name="Tajikistan">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Tokelau" encoding="TK" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Turkmenistan" encoding="TM">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TN" native_name="" english_name="Tunisia">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TO" native_name="" english_name="Tonga">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="East Timor" encoding="TP" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TR" native_name="" english_name="Turkey">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Trinidad &amp; Tobago" native_name="" encoding="TT">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Tuvalu" encoding="TV" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Taiwan, Province of China" encoding="TW">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="TZ" native_name="" english_name="Tanzania, United Republic of">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Ukraine" encoding="UA" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="UG" english_name="Uganda">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="United States Minor Outlying Islands" native_name="" encoding="UM">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="US" english_name="United States of America" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="United States of America" encoding="US">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Uruguay" encoding="UY">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Uzbekistan" native_name="" encoding="UZ">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="VA" english_name="Vatican City State (Holy See)">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="VC" english_name="St. Vincent &amp; the Grenadines">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VE" native_name="" english_name="Venezuela">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="British Virgin Islands" encoding="VG">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="VI" native_name="" english_name="United States Virgin Islands">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Viet Nam" native_name="" encoding="VN">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Vanuatu" native_name="" encoding="VU">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Wallis &amp; Futuna Islands" encoding="WF">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="WS" english_name="Samoa">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="YD" english_name="Democratic Yemen (no longer exists)">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Yemen" native_name="" encoding="YE">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="YT" native_name="" english_name="Mayotte">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Yugoslavia" encoding="YU" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ZA" native_name="" english_name="South Africa">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" english_name="Zambia" encoding="ZM">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM english_name="Zaire" native_name="" encoding="ZR">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ZW" native_name="" english_name="Zimbabwe">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM native_name="" encoding="ZZ" english_name="Unknown or unspecified country">
-                    <SYNONYMS/>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-06-25T14:50:49+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/NamesofLanguages_pl_PL.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/NamesofLanguages_pl_PL.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/vocabularies/NamesofLanguages_pl_PL.xml	(nonexistent)
@@ -1,1533 +0,0 @@
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value="4-9a9666d9-be72-4e3b-9929-9b32a793500d_Vm9jYWJ1bGFyeURTUmVzb3VyY2VzL1ZvY2FidWxhcnlEU1Jlc291cmNlVHlwZQ=="/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value=""/>
-        <DATE_OF_CREATION value="2008-04-03T20:37:24+02:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Names of Languages_pl_PL</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>ISO 639-2 list of languages. It defines mapping from iso639-1 and DRIVER derived values.</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM encoding="abk" english_name="Abkhaz" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ab"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ace" english_name="Acehnese" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ach" english_name="Acoli" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ada" english_name="Adangme" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="aar" english_name="Afar" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="aa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="afh" english_name="Afrihili" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="afr" english_name="Afrikaans" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="af"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="afa" english_name="Afro-Asiatic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="aka" english_name="Akan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="akk" english_name="Akkadian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="alb/sqi" english_name="Albanian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sq"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ale" english_name="Aleut" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="alg" english_name="Algonquian languages" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tut" english_name="Altaic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="amh" english_name="Amharic" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="am"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="apa" english_name="Apache" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ara" english_name="Arabic" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ar"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="arc" english_name="Aramaic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="arp" english_name="Arapaho" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="arn" english_name="Araucanian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="arw" english_name="Arawak" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="arm/hye" english_name="Armenian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hy"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="art" english_name="Artificial" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="asm" english_name="Assamese" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="as"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ath" english_name="Athapascan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="map" english_name="Austronesian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ava" english_name="Avaric" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ave" english_name="Avestan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="awa" english_name="Awadhi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="aym" english_name="Aymara" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ay"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="aze" english_name="Azerbaijani" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="az"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="nah" english_name="Aztec" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ban" english_name="Balinese" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bat" english_name="Baltic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bal" english_name="Baluchi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bam" english_name="Bambara" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bai" english_name="Bamileke" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bad" english_name="Banda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bnt" english_name="Bantu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bas" english_name="Basa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bak" english_name="Bashkir" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ba"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="baq/eus" english_name="Basque" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="eu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bej" english_name="Beja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bem" english_name="Bemba" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ben" english_name="Bengali" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ber" english_name="Berber" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bho" english_name="Bhojpuri" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bih" english_name="Bihari" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bik" english_name="Bikol" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bin" english_name="Bini" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bis" english_name="Bislama" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bra" english_name="Braj" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bre" english_name="Breton" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="br"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bug" english_name="Buginese" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bul" english_name="Bulgarian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bg"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bua" english_name="Buriat" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bur/mya" english_name="Burmese" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="my"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bel" english_name="Byelorussian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="be"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="cad" english_name="Caddo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="car" english_name="Carib" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cat" english_name="Catalan" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ca"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="cau" english_name="Caucasian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ceb" english_name="Cebuano" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cel" english_name="Celtic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cai" english_name="Central American Indian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chg" english_name="Chagatai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cha" english_name="Chamorro" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="che" english_name="Chechen" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chr" english_name="Cherokee" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chy" english_name="Cheyenne" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chb" english_name="Chibcha" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chi/zho" english_name="Chinese" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="zh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="chn" english_name="Chinook jargon" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cho" english_name="Choctaw" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chu" english_name="Church Slavic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="chv" english_name="Chuvash" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cop" english_name="Coptic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cor" english_name="Cornish" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cos" english_name="Corsican" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="co"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="cre" english_name="Cree" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mus" english_name="Creek" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="crp" english_name="Creoles and Pidgins" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cpe" english_name="English-based Creoles and Pidgins" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cpf" english_name="French-based Creoles and Pidgins" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cpp" english_name="Portuguese-based Creoles and Pidgins" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cus" english_name="Cushitic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="" english_name="Croatian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ces/cze" english_name="Czech" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="cs"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="dak" english_name="Dakota" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dan" english_name="Danish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="da"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="del" english_name="Delaware" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="din" english_name="Dinka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="div" english_name="Divehi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="doi" english_name="Dogri" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dra" english_name="Dravidian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dua" english_name="Duala" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dut/nla" english_name="Dutch" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="nl"/>
-                        <SYNONYM encoding="DRIVER" term="nl_nl"/>
-                        <SYNONYM encoding="DRIVER" term="nl_be"/>
-                        <SYNONYM encoding="DRIVER" term="nld"/>
-                        <SYNONYM encoding="DRIVER" term="dutdut"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="dum" english_name="Middle Dutch" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dyu" english_name="Dyula" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="dzo" english_name="Dzongkha" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="dz"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="efi" english_name="Efik" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="egy" english_name="Ancient Egyptian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="eka" english_name="Ekajuk" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="elx" english_name="Elamite" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="eng" english_name="English" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="en"/>
-                        <SYNONYM encoding="DRIVER" term="english"/>
-                        <SYNONYM encoding="DRIVER" term="en_us"/>
-                        <SYNONYM encoding="DRIVER" term="en_en"/>
-                        <SYNONYM encoding="DRIVER" term="en_au"/>
-                        <SYNONYM encoding="DRIVER" term="en_nz"/>
-                        <SYNONYM encoding="DRIVER" term="en_gb"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="enm" english_name="Middle English" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ang" english_name="Old English" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="esk" english_name="Eskimo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="epo" english_name="Esperanto" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="eo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="est" english_name="Estonian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="et"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ewe" english_name="Ewe" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ewo" english_name="Ewondo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fan" english_name="Fang" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fat" english_name="Fanti" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fao" english_name="Faroese" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="fij" english_name="Fijian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fj"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="fin" english_name="Finnish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="fiu" english_name="Finno-Ugrian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fon" english_name="Fon" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fra/fre" english_name="French" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fr"/>
-                        <SYNONYM encoding="DRIVER" term="fr_be"/>
-                        <SYNONYM encoding="DRIVER" term="fr_fr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="frm" english_name="Middle French" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fro" english_name="Old French" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fry" english_name="Frisian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fy"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ful" english_name="Fulah" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gaa" english_name="Ga" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gae/gdh" english_name="Gaelic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="glg" english_name="Gallegan" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="gl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lug" english_name="Ganda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gay" english_name="Gayo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gez" english_name="Geez" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="geo/kat" english_name="Georgian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ka"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="deu/ger" english_name="German" native_name="Deutsch">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="de"/>
-                        <SYNONYM encoding="iso639-1" term="german"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="gmh" english_name="Middle High German" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="goh" english_name="Old High German" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gem" english_name="Germanic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gil" english_name="Gilbertese" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gon" english_name="Gondi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="got" english_name="Gothic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="grb" english_name="Grebo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="grc" english_name="Ancient Greek" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ell/gre" english_name="Greek" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="el"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kal" english_name="Greenlandic" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="kl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="grn" english_name="Guarani" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="gn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="guj" english_name="Gujarati" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="gu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="hai" english_name="Haida" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="hau" english_name="Hausa" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ha"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="haw" english_name="Hawaiian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="heb" english_name="Hebrew" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="he"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="her" english_name="Herero" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="hil" english_name="Hiligaynon" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="him" english_name="Himachali" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="hin" english_name="Hindi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="hmo" english_name="Hiri Motu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="hun" english_name="Hungarian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="hu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="hup" english_name="Hupa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="iba" english_name="Iban" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ice/isl" english_name="Icelandic" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="is"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ibo" english_name="Igbo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ijo" english_name="Ijo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ilo" english_name="Iloko" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="inc" english_name="Indic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ine" english_name="Indo-European" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ind" english_name="Indonesian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="id"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ina" english_name="Interlingua" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ia"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ine" english_name="Interlingue" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="-"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="iku" english_name="Inuktitut" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="iu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ipk" english_name="Inupiak" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ik"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ira" english_name="Iranian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="gai/iri" english_name="Irish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ga"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="gle" english_name="Irish" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sga" english_name="old Irish" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mga" english_name="Middle Irish" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="iro" english_name="Iroquoian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ita" english_name="Italian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="it"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="jpn" english_name="Japanese" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ja"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="jav/jaw" english_name="Javanese" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="jv/jw"/>
-                        <SYNONYM encoding="iso639-1" term="jv"/>
-                        <SYNONYM encoding="iso639-1" term="jw"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="jrb" english_name="Judeo-Arabic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="jpr" english_name="Judeo-Persian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kab" english_name="Kabyle" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kac" english_name="Kachin" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kam" english_name="Kamba" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kan" english_name="Kannada" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="kn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kau" english_name="Kanuri" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kaa" english_name="Kara-Kalpak" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kar" english_name="Karen" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kas" english_name="Kashmiri" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ks"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kaw" english_name="Kawi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kaz" english_name="Kazakh" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="kk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kha" english_name="Khasi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="khm" english_name="Khmer" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="km"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="khi" english_name="Khoisan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kho" english_name="Khotanese" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kik" english_name="Kikuyu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kin" english_name="Kinyarwanda" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="rw"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kir" english_name="Kirghiz" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ky"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kom" english_name="Komi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kon" english_name="Kongo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kok" english_name="Konkani" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kor" english_name="Korean" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ko"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kpe" english_name="Kpelle" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kro" english_name="Kru" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kua" english_name="Kuanyama" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kum" english_name="Kumyk" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kur" english_name="Kurdish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ku"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="kru" english_name="Kurukh" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kus" english_name="Kusaie" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="kut" english_name="Kutenai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lad" english_name="Ladino" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lah" english_name="Lahnda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lam" english_name="Lamba" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="oci" english_name="Langue d'Oc" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="oc"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lao" english_name="Lao" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="lo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lat" english_name="Latin" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="la"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lav" english_name="Latvian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="lv"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ltz" english_name="Letzeburgesch" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lez" english_name="Lezghian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lin" english_name="Lingala" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ln"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="lit" english_name="Lithuanian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="lt"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="loz" english_name="Lozi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lub" english_name="Luba-Katanga" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lui" english_name="Luiseno" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lun" english_name="Lunda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="luo" english_name="Luo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mac/mak" english_name="Macedonian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mad" english_name="Madurese" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mag" english_name="Magahi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mai" english_name="Maithili" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mak" english_name="Makasar" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mlg" english_name="Malagasy" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mg"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="may/msa" english_name="Malay" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ms"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mal" english_name="Malayalam" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mlt" english_name="Maltese" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ml"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="man" english_name="Mandingo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mni" english_name="Manipuri" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mno" english_name="Manobo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="max" english_name="Manx" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mao/mri" english_name="Maori" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mar" english_name="Marathi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="chm" english_name="Mari" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mah" english_name="Marshall" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mwr" english_name="Marwari" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mas" english_name="Masai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="myn" english_name="Mayan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="men" english_name="Mende" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mic" english_name="Micmac" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="min" english_name="Minangkabau" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mis" english_name="Miscellaneous" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="moh" english_name="Mohawk" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mol" english_name="Moldavian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mkh" english_name="Mon-Kmer" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="lol" english_name="Mongo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mon" english_name="Mongolian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="mn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="mos" english_name="Mossi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mul" english_name="Multiple languages" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="mun" english_name="Munda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nau" english_name="Nauru" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="na"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="nav" english_name="Navajo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nde" english_name="Ndebele" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nbl" english_name="Ndebele" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ndo" english_name="Ndongo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nep" english_name="Nepali" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ne"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="new" english_name="Newari" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nic" english_name="Niger-Kordofanian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ssa" english_name="Nilo-Saharan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="niu" english_name="Niuean" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="non" english_name="Norse" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nai" english_name="North American Indian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nor" english_name="Norwegian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="no"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="nno" english_name="Ngomba" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nub" english_name="Nubian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nym" english_name="Nyamwezi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nya" english_name="Nyanja" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nyn" english_name="Nyankole" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nyo" english_name="Nyoro" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nzi" english_name="Nzima" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="oji" english_name="Ojibwa" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ori" english_name="Oriya" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="or"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="orm" english_name="Oromo" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="om"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="osa" english_name="Osage" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="oss" english_name="Ossetic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="oto" english_name="Otomian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pal" english_name="Pahlavi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pau" english_name="Palauan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pli" english_name="Pali" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pam" english_name="Pampanga" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pag" english_name="Pangasinan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pan" english_name="Panjabi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="pap" english_name="Papiamento" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="paa" english_name="Papuan-Australian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="fas/per" english_name="Persian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="fa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="peo" english_name="Persian, Old (ca 600 - 400 B.C.)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="phn" english_name="Phoenician" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pol" english_name="Polish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="pon" english_name="Ponape" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="por" english_name="Portuguese" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="pt"/>
-                        <SYNONYM encoding="DRIVER" term="pt_pt"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="pra" english_name="Prakrit" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pro" english_name="Provencal" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="pus" english_name="Pushto" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ps"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="que" english_name="Quechua" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="qu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="roh" english_name="Rhaeto-Romance" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="rm"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="raj" english_name="Rajasthani" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="rar" english_name="Rarotongan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="roa" english_name="Romance" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ron/rum" english_name="Romanian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ro"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="rom" english_name="Romany" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="run" english_name="Rundi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="rn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="rus" english_name="Russian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ru"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sal" english_name="Salishan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sam" english_name="Samaritan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="smi" english_name="Sami" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="smo" english_name="Samoan" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sm"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sad" english_name="Sandawe" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sag" english_name="Sango" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sg"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="san" english_name="Sanskrit" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="srd" english_name="Sardinian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sco" english_name="Scots" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sel" english_name="Selkup" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sem" english_name="Semitic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="" english_name="Serbian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="scr" english_name="Serbo-Croatian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="srr" english_name="Serbian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="shn" english_name="Shan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sna" english_name="Shona" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sid" english_name="Sidamo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="bla" english_name="Siksika" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="snd" english_name="Sindhi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sd"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sin" english_name="Singhalese" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="si"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sit" english_name="Sino-Tibetan" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="-"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sio" english_name="Siouan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sla" english_name="Slavic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ssw" english_name="Siswant" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ss"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="slk/slo" english_name="Slovak" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="slv" english_name="Slovenian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sog" english_name="Sogdian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="som" english_name="Somali" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="so"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="son" english_name="Songhai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="wen" english_name="Sorbian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="nso" english_name="Sotho" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sot" english_name="Sotho" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="st"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sai" english_name="South American Indian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="esl/spa" english_name="Spanish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="es"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="suk" english_name="Sukuma" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sux" english_name="Sumerian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sun" english_name="Sudanese" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="su"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sus" english_name="Susu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="swa" english_name="Swahili" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sw"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ssw" english_name="Swazi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="sve/swe" english_name="Swedish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="sv"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="syr" english_name="Syriac" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tgl" english_name="Tagalog" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tl"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tah" english_name="Tahitian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tgk" english_name="Tajik" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tg"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tmh" english_name="Tamashek" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tam" english_name="Tamil" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ta"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tat" english_name="Tatar" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tt"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tel" english_name="Telugu" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="te"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ter" english_name="Tereno" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tha" english_name="Thai" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="th"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="bod/tib" english_name="Tibetan" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="bo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tig" english_name="Tigre" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tir" english_name="Tigrinya" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ti"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tem" english_name="Timne" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tiv" english_name="Tivi" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tli" english_name="Tlingit" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tog" english_name="Tonga(Nyasa)" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="to"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ton" english_name="Tonga(Tonga Islands)" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tru" english_name="Truk" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tsi" english_name="Tsimshian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tso" english_name="Tsonga" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ts"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tsn" english_name="Tswana" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tn"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tum" english_name="Tumbuka" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tur" english_name="Turkish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tr"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ota" english_name="Ottoman" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="tuk" english_name="Turkmen" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="tyv" english_name="Tuvinian" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="twi" english_name="Twi" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="tw"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="uga" english_name="Ugaritic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="uig" english_name="Uighur" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ug"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="ukr" english_name="Ukrainian" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="uk"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="umb" english_name="Umbundu" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="und" english_name="Undetermined" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="urd" english_name="Urdu" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="ur"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="uzb" english_name="Uzbek" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="uz"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="vai" english_name="Vai" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="ven" english_name="Venda" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="vie" english_name="Vietnamese" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="vi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="vol" english_name="VolapÃƒÂ¼k" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="vo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="vot" english_name="Votic" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="wak" english_name="Wakashan" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="wal" english_name="Walamo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="wln" english_name="Wallon" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="wa"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="war" english_name="Waray" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="was" english_name="Washo" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="cym/wel" english_name="Welsh" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="cy"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="wol" english_name="Wolof" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="wo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="xho" english_name="Xhosa" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="xh"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="sah" english_name="Yakut" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="yao" english_name="Yao" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="yap" english_name="Yap" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="yid" english_name="Yiddish" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="yi"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="yor" english_name="Yoruba" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="yo"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="zap" english_name="Zapotec" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="zen" english_name="Zenaga" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM encoding="zha" english_name="Zhuang" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="za"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="zul" english_name="Zulu" native_name="">
-                    <SYNONYMS>
-                        <SYNONYM encoding="iso639-1" term="zu"/>
-                    </SYNONYMS>
-                </TERM>
-                <TERM encoding="zun" english_name="Zuni" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-04-03T20:37:24+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/velocity.vm
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/velocity.vm	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/velocity.vm	(nonexistent)
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  xmlns:vocman="eu.dnetlib.data.search.utils.vocabulary.VocabularyManagerWrapper" 
-  extension-element-prefixes="vocman">
-<xsl:output method="xml" indent="yes" encoding="UTF-8"/>
-
-<xsl:template match="/">
-	<xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="@*|node()">
-	<xsl:copy>
-		<xsl:apply-templates select="@*|node()"/>
-	</xsl:copy>
-</xsl:template>
-
-
-#foreach($transformation in $transformations)
-	#set($temp="")
-	
-	#foreach($field in $transformation.getMatches())
-		#set($temp="${temp}field[@name='$field']/")
-	#end
-
-	<xsl:template match="${temp}@value">
-		<xsl:choose>	
-			<xsl:when test='../@$transformation.getChange()_original'>	
-				<xsl:attribute name='$transformation.getChange()'>
-					<xsl:value-of select="vocman:translate('$transformation.getVocabulary()','$locale',current()/../@value_original,current())"/>	
-				</xsl:attribute>
-			</xsl:when>
-			
-			<xsl:otherwise>
-				<xsl:attribute name='$transformation.getChange()_original'>
-					<xsl:value-of select="."/>
-				</xsl:attribute>
-				<xsl:attribute name='$transformation.getChange()'>		
-					<xsl:value-of select="vocman:translate('$transformation.getVocabulary()','$locale',current(),current())"/>		
-				</xsl:attribute>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-#end
-</xsl:stylesheet>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/rss_template.vm
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/rss_template.vm	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/rss_template.vm	(nonexistent)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"  ?>
-<rss version="2.0" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/">
-	<channel>
-		<title>OpenAIRE search results</title>
-		<link>www.openaire.eu</link>
-		<description>Results for query: $query </description>
-		<language>$locale</language>
-		<pubDate>$currentDate</pubDate>
-		<lastBuildDate>$currentDate</lastBuildDate>
-		<generator>OpenAIRE RSS Generator</generator>
-
-		<opensearch:totalResults>$total</opensearch:totalResults>
-		<opensearch:startIndex>$page</opensearch:startIndex>
-		<opensearch:itemsPerPage>$size</opensearch:itemsPerPage>
-
-		#if( $results )
-			#foreach($result in $results)
-                $result
-			#end
-		#end
-
-	</channel>
-</rss>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/browse.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/browse.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/browse.xsl	(nonexistent)
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<xsl:output method="xml" indent="yes" encoding="UTF-8"/>
-<xsl:template match="/">
-<result>
-	<xsl:apply-templates select="row/groupresult"/>
-</result>
-</xsl:template>
-
-<xsl:template match="groupresult[@field='publicationyear']">
-	<field name="publicationyear" indexId="publicationyear">	
-		<field name="count">
-		<xsl:attribute name="value">
-			<xsl:value-of select="./count"/>
-		</xsl:attribute>
-		</field>
-		<field name="value">
-		<xsl:attribute name="value">
-			<xsl:value-of select="./value"/>
-		</xsl:attribute>
-		</field>
-	</field>
-</xsl:template>
-
-<xsl:template match="groupresult[@field='language']">
-	<field name="language" indexId="language">	
-		<field name="count">
-		<xsl:attribute name="value">
-			<xsl:value-of select="./count"/>
-		</xsl:attribute>
-		</field>
-		<field name="value">
-		<xsl:attribute name="value">
-			<xsl:value-of select="./value"/>
-		</xsl:attribute>
-		</field>
-	</field>
-</xsl:template>
-
-<xsl:template match="groupresult[@field='projectname']">
-	<field name="projectname" indexId="projectname">	
-		<field name="count">
-		<xsl:attribute name="value">
-			<xsl:value-of select="./count"/>
-		</xsl:attribute>
-		</field>
-		<field name="value">
-		<xsl:attribute name="value">
-			<xsl:value-of select="./value"/>
-		</xsl:attribute>
-		</field>
-	</field>
-</xsl:template>
-
-<xsl:template match="groupresult[@field='programname']">
-	<field name="programmname" indexId="programname">	
-		<field name="count">
-		<xsl:attribute name="value">
-			<xsl:value-of select="./count"/>
-		</xsl:attribute>
-		</field>
-		<field name="value">
-		<xsl:attribute name="value">
-			<xsl:value-of select="./value"/>
-		</xsl:attribute>
-		</field>
-	</field>
-</xsl:template>
-
-<xsl:template match="groupresult[@field='specificprogramname']">
-	<field name="subject" indexId="specificprogramname">	
-		<field name="count">
-		<xsl:attribute name="value">
-			<xsl:value-of select="./count"/>
-		</xsl:attribute>
-		</field>
-		<field name="value">
-		<xsl:attribute name="value">
-			<xsl:value-of select="./value"/>
-		</xsl:attribute>
-		</field>
-	</field>
-</xsl:template>
-</xsl:stylesheet>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/format.vm
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/format.vm	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/format.vm	(nonexistent)
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<response>
-	<header>
-		<query>$query</query>
-		#if($format)
-			<format>$format</format>
-		#end
-		<locale>$locale</locale>	
-		#if($results)
-			<size>$size</size>
-			<page>$page</page>
-			<total>$total</total>
-		#end
-		#if($bresults)
-			<fields>
-				#foreach($fd in $fields)
-					<field>$fd</field>
-				#end
-			</fields>
-		#end	
-	</header>
-	<results>
-			#if( $results )
-			#foreach($result in $results)
-				$result
-			#end
-		#end
-	</results>
-	<browseResults>
-		#if( $bresults )
-			#foreach($result in $bresults)
-				$result
-			#end
-		#end
-	</browseResults>
-</response>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/xsl_test.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/xsl_test.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/transform/config/xsl_test.xsl	(nonexistent)
@@ -1,14 +0,0 @@
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<xsl:output method="xml" indent="yes" encoding="UTF-8"/>
-<xsl:template match="/">
-	<xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="@*|node()">
-	<xsl:copy>
-		<xsl:apply-templates select="@*|node()"/>
-	</xsl:copy>
-</xsl:template>
-
-</xsl:stylesheet>
-		
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/web/api/dispatcher-servlet.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/web/api/dispatcher-servlet.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/web/api/dispatcher-servlet.xml	(nonexistent)
@@ -1,11 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:context="http://www.springframework.org/schema/context"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans
-	http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
-	http://www.springframework.org/schema/context
-	http://www.springframework.org/schema/context/spring-context-4.0.xsd">
-
-	<context:component-scan base-package="eu.dnetlib.data.search.web.api" />
-
-</beans>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/solr/springContext-searchService-solr.properties
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/solr/springContext-searchService-solr.properties	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/solr/springContext-searchService-solr.properties	(nonexistent)
@@ -1,4 +0,0 @@
-# service | solr
-services.search.indexMode = solr
-
-services.search.interpretation = openaire
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/solr/springContext-searchService-solr.xml
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/xml
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/solr/springContext-searchService-solr.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/solr/springContext-searchService-solr.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/solr/springContext-searchService-solr.xml	(nonexistent)

Property changes on: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/eu/dnetlib/data/search/solr/springContext-searchService-solr.xml
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/xml
\ No newline at end of property
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/csv_datasource.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/csv_datasource.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/csv_datasource.xsl	(nonexistent)
@@ -1,43 +0,0 @@
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:dri="http://www.driver-repository.eu/namespace/dri"
-                xmlns:oaf="http://namespace.openaire.eu/oaf"
-                xmlns:dc="http://purl.org/dc/elements/1.1/">
-
-    <!-- Turn off auto-insertion of <?xml> tag and set indenting on -->
-    <xsl:output method="text" encoding="utf-8" omit-xml-declaration="yes" media-type="text/csv" />
-
-    <!-- strip whitespace from whitespace-only nodes -->
-    <xsl:strip-space elements="*"/>
-
-    <xsl:template match = "/">
-        <xsl:apply-templates select="//oaf:datasource"/>
-    </xsl:template>
-
-    <!-- Name, Type, Compatibility, OAI-PMH, website -->
-    <xsl:template match="oaf:datasource">
-
-        <!-- Name -->
-        <xsl:text>"</xsl:text>
-        <xsl:value-of select="officialname"/>
-        <xsl:text>",</xsl:text>
-
-        <!-- Type -->
-        <xsl:value-of select="datasourcetype/@classname"/>
-        <xsl:text>,</xsl:text>
-
-        <!-- Compatibility -->
-        <xsl:value-of select="openairecompatibility/@classname"/>
-        <xsl:text>,</xsl:text>
-
-        <!-- OAI-PMH -->
-        <xsl:value-of select="accessinfopackage"/>
-        <xsl:text>,</xsl:text>
-
-        <!-- website -->
-        <xsl:value-of select="websiteurl"/>
-        <xsl:text>&#xd;</xsl:text>
-
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/programmes.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/programmes.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/programmes.xml	(nonexistent)
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value=""/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2008-06-25T14:50:49+02:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Programmes</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>Programmes descriptions</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM code="ec__________::EC::FP7::SP1" english_name="EC::FP7::Cooperation" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP2" english_name="EC::FP7::Ideas" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP3" english_name="EC::FP7::People" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP4" english_name="EC::FP7::Capacities" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP5" english_name="EC::FP7::Euratom" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::UNKNOWN" english_name="EC::FP7::UNKNOWN" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-06-25T14:50:49+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/datasource_mini.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/datasource_mini.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/datasource_mini.xsl	(nonexistent)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-xmlns:dri="http://www.driver-repository.eu/namespace/dri"
-xmlns:oaf="http://namespace.openaire.eu/oaf"
-xmlns:dc="http://purl.org/dc/elements/1.1/">
-<xsl:output method="xml" indent="yes" encoding="UTF-8"/>
-
-<xsl:template match = "/">
-<result type ="result">
-	<xsl:apply-templates select="//header"/>
-	<xsl:apply-templates select="//oaf:datasource"/>
-</result>
-</xsl:template>
-
-<xsl:template match = "header">
-	<encoding>
-		<xsl:value-of select='./dri:objIdentifier'/>
-	</encoding>
-</xsl:template>
-
-
-<xsl:template match = "oaf:datasource">
-	<xsl:for-each select = "./officialname">
-		<value>
-			<xsl:value-of select='.'/>
-		</value>
-	</xsl:for-each>
-</xsl:template>
-
-</xsl:stylesheet>
-
-
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/project.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/project.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/project.xsl	(nonexistent)
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-				xmlns:dri="http://www.driver-repository.eu/namespace/dri"
-				xmlns:oaf="http://namespace.openaire.eu/oaf"
-				xmlns:dc="http://purl.org/dc/elements/1.1/">
-	<xsl:output method="xml" indent="yes" encoding="UTF-8"/>
-	<!-- PROJECT
-    missing fields:
-    1. scientific area ?
-    2. programme ?
-    3. cordis link ?
-    4. publications
-     -->
-	<xsl:template match = "/">
-		<result type ="result">
-			<xsl:apply-templates select="//header"/>
-			<xsl:apply-templates select="//oaf:project"/>
-			<xsl:apply-templates select="//rel"/>
-			<!--	<xsl:apply-templates select="//funding[parent[not(node())]] "/-->
-			<xsl:apply-templates select="//funding_level_2"/>
-			<xsl:apply-templates select="//funding_level_1"/>
-			<xsl:apply-templates select="//funding_level_0"/>
-			<xsl:apply-templates select="//funder"/>
-		</result>
-	</xsl:template>
-
-	<!-- HEADER
-    fields in header:
-    1. dri:objIdentifier 		[objIdentifier]
-    2. dri:repositoryId			X
-    3. dri:dateOfCollection		X
-    -->
-	<xsl:template match = "header">
-		<field name="projectId" multiplicity="false" indexId="objIdentifier" label="Object id">
-			<xsl:attribute name="value">
-				<xsl:value-of select='./dri:objIdentifier'/>
-			</xsl:attribute>
-		</field>
-		<xsl:if test="substring(./dri:objIdentifier,1,4)='ec::'">
-			<field name="grantagreementnumber" multiplicity="false" indexId="" label="Grant agreement number">
-				<xsl:attribute name="value">
-					<xsl:value-of select="substring(./dri:objIdentifier,5)"/>
-				</xsl:attribute>
-			</field>
-		</xsl:if>
-
-		<!--<field name="repositoryId" multiplicity="false" indexId="???" label="???">
-            <xsl:attribute name="value">
-                <xsl:value-of select='./dri:repositoryId'/>
-            </xsl:attribute>
-        </field>-->
-		<!--<field name="dateOfCollection" multiplicity="false" indexId="???" label="???">
-            <xsl:attribute name="value">
-                <xsl:value-of select='./dri:dateOfCollection'/>
-            </xsl:attribute>
-        </field>-->
-	</xsl:template>
-
-	<xsl:template match = "oaf:project">
-
-		<xsl:for-each select = "./acronym">
-			<field name="name" indexId = "projectacronym" multiplicity="true" label="Project">
-				<xsl:attribute name="value">
-					<xsl:value-of select='.'/>
-				</xsl:attribute>
-			</field>
-		</xsl:for-each>
-
-		<xsl:for-each select = "./code">
-			<field name="code" indexId = "projectcode" multiplicity="true" label="Project code">
-				<xsl:attribute name="value">
-					<xsl:value-of select='.'/>
-				</xsl:attribute>
-			</field>
-		</xsl:for-each>
-
-		<xsl:for-each select = "./title">
-			<field name="title" indexId = "projecttitle" multiplicity="true" label="Title">
-				<xsl:attribute name="value">
-					<xsl:value-of select='.'/>
-				</xsl:attribute>
-			</field>
-		</xsl:for-each>
-
-		<xsl:for-each select = "./startdate">
-			<field name="startyear" indexId = "projectstartyear" multiplicity="true" label="Start year">
-				<xsl:attribute name="value">
-					<xsl:value-of select='substring-before(.,"-")'/>
-				</xsl:attribute>
-			</field>
-			<field name="startdate" indexId = "projectstartdate" multiplicity="true" label="Start date">
-				<xsl:attribute name="value">
-					<xsl:value-of select='.'/>
-				</xsl:attribute>
-			</field>
-		</xsl:for-each>
-
-		<xsl:for-each select = "./enddate">
-			<field name="endyear" indexId = "projectendyear" multiplicity="true" label="End year">
-				<xsl:attribute name="value">
-					<xsl:value-of select="substring-before(.,'-')"/>
-				</xsl:attribute>
-			</field>
-			<field name="enddate" indexId = "projectenddate" multiplicity="true" label="End date">
-				<xsl:attribute name="value">
-					<xsl:value-of select='.'/>
-				</xsl:attribute>
-			</field>
-		</xsl:for-each>
-
-		<xsl:for-each select = "./callidentifier">
-			<field name="call_identifier" indexId = "projectcallidentifier" multiplicity="true" label="Call">
-				<xsl:attribute name="value">
-					<xsl:value-of select='.'/>
-				</xsl:attribute>
-			</field>
-		</xsl:for-each>
-
-		<xsl:for-each select = "./ecsc39">
-			<field name="ec_sc39" indexId = "projectecsc39" multiplicity="true" label="Special clause 39">
-				<xsl:attribute name="value">
-					<xsl:value-of select='.'/>
-				</xsl:attribute>
-			</field>
-		</xsl:for-each>
-
-		<xsl:for-each select = "./oamandatepublications">
-			<field name="oamandatepublications" indexId = "" multiplicity="false" label="OA mandate">
-				<xsl:attribute name="value">
-					<xsl:value-of select='.'/>
-				</xsl:attribute>
-			</field>
-		</xsl:for-each>
-
-		<xsl:for-each select = "./ecarticle29_3">
-			<field name="ecarticle29_3" indexId = "" multiplicity="false" label="Data Pilot">
-				<xsl:attribute name="value">
-					<xsl:value-of select='.'/>
-				</xsl:attribute>
-			</field>
-		</xsl:for-each>
-
-
-
-		<xsl:for-each select = "./collectedfrom">
-			<field name="collectedfrom" indexId = "projectcollectedfrom" multiplicity="true" label="Collected from">
-				<xsl:attribute name="value">
-					<xsl:value-of select='./@id'/>
-				</xsl:attribute>
-			</field>
-			<field name="collectedfromname" indexId = "" multiplicity="true" label="Collected from name">
-				<xsl:attribute name="value">
-					<xsl:value-of select='./@name'/>
-				</xsl:attribute>
-			</field>
-		</xsl:for-each>
-
-
-		<xsl:for-each select = "./contracttype">
-			<field name="contracttypeid" indexId = "projectcontracttypeid" multiplicity="true" label="Contract type id">
-				<xsl:attribute name="value">
-					<xsl:value-of select='./@classid'/>
-				</xsl:attribute>
-			</field>
-			<field name="contracttypename" indexId = "projectcontracttypename" multiplicity="true" label="Contract type name">
-				<xsl:attribute name="value">
-					<xsl:value-of select='./@classname'/>
-				</xsl:attribute>
-			</field>
-		</xsl:for-each>
-
-		<xsl:for-each select = "./pid">
-			<field name="pidid" indexId = "pidclassid" multiplicity="true" label="Pid">
-				<xsl:attribute name="value">
-					<xsl:value-of select='./@classid'/>
-				</xsl:attribute>
-			</field>
-			<field name="pidname" indexId = "pidclassname" multiplicity="true" label="Pid">
-				<xsl:attribute name="value">
-					<xsl:value-of select='./@classname'/>
-				</xsl:attribute>
-			</field>
-		</xsl:for-each>
-
-		<xsl:for-each select = "./websiteurl">
-			<field name="websiteurl" indexId = "projectwebsiteurl" multiplicity="true" label="Website url">
-				<xsl:attribute name="value">
-					<xsl:value-of select='.'/>
-				</xsl:attribute>
-			</field>
-		</xsl:for-each>
-
-		<xsl:for-each select = "./keywords">
-			<field name="keywords" indexId = "projectkeywords" multiplicity="true" label="Keywords">
-				<xsl:attribute name="value">
-					<xsl:value-of select='.'/>
-				</xsl:attribute>
-			</field>
-		</xsl:for-each>
-
-		<xsl:for-each select = "./duration">
-			<field name="duration" indexId = "projectduration" multiplicity="true" label="Duration">
-				<xsl:attribute name="value">
-					<xsl:value-of select='.'/>
-				</xsl:attribute>
-			</field>
-		</xsl:for-each>
-	</xsl:template>
-
-
-	<!--  RELS
-    1. person
-    2. project
-    3. organisation
-    4. result
-    5. datasource
-    -->
-	<xsl:template match="rel">
-		<!--PERSON-->
-		<xsl:if test="./to/@type='person'">
-			<field name="author" indexId = "objIdentifier"  multiplicity="true">
-				<xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-				<field name = "personId" indexId ="objIdentifier" multiplicity="false" label="Person id">
-					<xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-				</field>
-				<field name = "role" indexId ="" multiplicity="false" label="role">
-					<xsl:attribute name="value"><xsl:value-of select='./to/@class'/> </xsl:attribute>
-				</field>
-				<field name = "fullname" indexId ="personfullname" multiplicity="false" label="Person fullname">
-					<xsl:attribute name="value"><xsl:value-of select='./fullname'/> </xsl:attribute>
-				</field>
-				<field name = "ranking" indexId ="" multiplicity="false" label="ranking">
-					<xsl:attribute name="value"><xsl:value-of select='./ranking'/> </xsl:attribute>
-				</field>
-			</field>
-		</xsl:if>
-		<!--PROJECT-->
-		<xsl:if test="./to/@type='project'">
-			<field name="project" indexId = "objIdentifier" multiplicity="true">
-				<xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-				<field name = "projectId" indexId ="objIdentifier" multiplicity="false" label="Project id">
-					<xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-				</field>
-				<field name = "role" indexId ="" multiplicity="false" label="role">
-					<xsl:attribute name="value"><xsl:value-of select='./to/@class'/> </xsl:attribute>
-				</field>
-				<field name = "projectcode" indexId ="projectcode" multiplicity="false" label="Project(s)">
-					<xsl:attribute name="value"><xsl:value-of select='./code'/> </xsl:attribute>
-				</field>
-				<field name = "projectacronym" indexId ="projectacronym" multiplicity="false" label="Project(s)">
-					<xsl:attribute name="value"><xsl:value-of select='./acronym'/> </xsl:attribute>
-				</field>
-				<field name = "projecttitle" indexId ="projecttitle" multiplicity="false" label="Project title">
-					<xsl:attribute name="value"><xsl:value-of select='./title'/> </xsl:attribute>
-				</field>
-				<field name = "projectcontracttypeid" indexId ="projectcontracttypeid" multiplicity="false" label="Project contract type id">
-					<xsl:attribute name="value"><xsl:value-of select='./contracttype/@classid'/> </xsl:attribute>
-				</field>
-				<field name = "projectcontracttypename" indexId ="projectcontracttypename" multiplicity="false" label="Project contract type name">
-					<xsl:attribute name="value"><xsl:value-of select='./contracttype/@classname'/> </xsl:attribute>
-				</field>
-			</field>
-		</xsl:if>
-		<!--RESULT-->
-		<xsl:if test="./to/@type='result'">
-			<field name="result" indexId = "objIdentifier"  multiplicity="true">
-				<xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-				<field name = "resultid" indexId ="objIdentifier" multiplicity="false" label="Result id">
-					<xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-				</field>
-				<field name = "title" indexId = "resulttitle" multiplicity = "false" label = "Title">
-					<xsl:attribute name="value">
-						<xsl:value-of select="./title"/>
-					</xsl:attribute>
-				</field>
-				<field name = "dateofacceptance" indexId = "resultdateofacceptance" multiplicity = "false" label = "Date of acceptance">
-					<xsl:attribute name="value">
-						<xsl:value-of select="./dateofacceptance"/>
-					</xsl:attribute>
-				</field>
-				<field name = "resulttypeid" indexId = "resulttypeid" multiplicity = "false" label = "type id">
-					<xsl:attribute name="value">
-						<xsl:value-of select="./resulttype/@classid"/>
-					</xsl:attribute>
-				</field>
-				<field name = "resulttypename" indexId = "resulttypename" multiplicity = "false" label = "type name">
-					<xsl:attribute name="value">
-						<xsl:value-of select="./resulttype/@classname"/>
-					</xsl:attribute>
-				</field>
-			</field>
-		</xsl:if>
-		<!--ORGANIZATION-->
-		<xsl:if test="./to/@type='organization'">
-			<field name="organization" indexId = "objIdentifier"  multiplicity="true">
-				<xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-				<field name = "organizationid" indexId ="objIdentifier" multiplicity="false" label="Organization id">
-					<xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-				</field>
-				<field name = "role" indexId ="" multiplicity="false" label="role">
-					<xsl:attribute name="value"><xsl:value-of select='./to/@class'/> </xsl:attribute>
-				</field>
-				<field name = "legalshortname" indexId ="organizationlegalshortname" multiplicity="false" label="Organization short name">
-					<xsl:attribute name="value"><xsl:value-of select='./legalshortname'/> </xsl:attribute>
-				</field>
-				<field name = "legalname" indexId ="organizationlegalname" multiplicity="false" label="Organization name">
-					<xsl:attribute name="value"><xsl:value-of select='./legalname'/> </xsl:attribute>
-				</field>
-				<field name = "websiteurl" indexId ="organizationwebsiteurl" multiplicity="false" label="Website">
-					<xsl:attribute name="value"><xsl:value-of select='./websiteurl'/> </xsl:attribute>
-				</field>
-				<field name = "countryid" indexId ="organizationcountryid" multiplicity="false" label="Country code">
-					<xsl:attribute name="value"><xsl:value-of select='./country/@classid'/> </xsl:attribute>
-				</field>
-				<field name = "countryname" indexId ="organizationcountryname" multiplicity="false" label="Country">
-					<xsl:attribute name="value"><xsl:value-of select='./country/@classname'/> </xsl:attribute>
-				</field>
-				<field name = "participantnumber" indexId ="" multiplicity="false" label="Participant Number">
-					<xsl:attribute name="value"><xsl:value-of select='./participantnumber'/> </xsl:attribute>
-				</field>
-				<field name = "contactperson" indexId ="" multiplicity="false" label="Contact Person">
-					<xsl:attribute name="value"><xsl:value-of select='./contactperson'/> </xsl:attribute>
-				</field>
-			</field>
-		</xsl:if>
-
-	</xsl:template>
-
-
-	<xsl:template match="funding_level_2">
-		<field name="funding_level_2" multiplicity="false">
-			<field name="fundingid" indexId="fundinglevel2_id" label="">
-				<xsl:attribute name="value"> <xsl:value-of select="./id"/> </xsl:attribute>
-			</field>
-			<field name="fundingdescription" indexId="fundingprogramdescription" label="">
-				<xsl:attribute name="value"> <xsl:value-of select="./description"/> </xsl:attribute>
-			</field>
-			<field name="fundingname" indexId="fundingprogramname" label="">
-				<xsl:attribute name="value"> <xsl:value-of select="./name"/> </xsl:attribute>
-			</field>
-			<field name="fundingclass" indexId="" label="">
-				<xsl:attribute name="value"> <xsl:value-of select="./class"/> </xsl:attribute>
-			</field>
-		</field>
-	</xsl:template>
-
-	<xsl:template match="funding_level_1">
-		<field name="funding_level_1" multiplicity="false">
-			<field name="fundingid" indexId="fundinglevel1_id" label="">
-				<xsl:attribute name="value"> <xsl:value-of select="./id"/> </xsl:attribute>
-			</field>
-			<field name="fundingdescription" indexId="fundingstreamnamedescription" label="">
-				<xsl:attribute name="value"> <xsl:value-of select="./description"/> </xsl:attribute>
-			</field>
-			<field name="fundingname" indexId="fundingstreamname" label="">
-				<xsl:attribute name="value"> <xsl:value-of select="./name"/> </xsl:attribute>
-			</field>
-			<field name="fundingclass" indexId="" label="">
-				<xsl:attribute name="value"> <xsl:value-of select="./class"/> </xsl:attribute>
-			</field>
-		</field>
-	</xsl:template>
-
-	<xsl:template match="funding_level_0">
-		<field name="funding_level_0" multiplicity="false">
-			<field name="fundingid" indexId="fundinglevel0_id" label="">
-				<xsl:attribute name="value"> <xsl:value-of select="./id"/> </xsl:attribute>
-			</field>
-			<field name="fundingdescription" indexId="fundingstreamnamedescription" label="">
-				<xsl:attribute name="value"> <xsl:value-of select="./description"/> </xsl:attribute>
-			</field>
-			<field name="fundingname" indexId="fundingstreamname" label="">
-				<xsl:attribute name="value"> <xsl:value-of select="./name"/> </xsl:attribute>
-			</field>
-			<field name="fundingclass" indexId="" label="">
-				<xsl:attribute name="value"> <xsl:value-of select="./class"/> </xsl:attribute>
-			</field>
-		</field>
-	</xsl:template>
-
-
-	<xsl:template match="funder">
-		<field name="funder" multiplicity="true">
-			<field name="funderid" indexId="funderid" label="">
-				<xsl:attribute name="value"> <xsl:value-of select="./id"/> </xsl:attribute>
-			</field>
-			<field name="fundershortname" indexId="fundershortname" label="">
-				<xsl:attribute name="value"> <xsl:value-of select="./shortname"/> </xsl:attribute>
-			</field>
-			<field name="fundername" indexId="fundername" label="">
-				<xsl:attribute name="value"> <xsl:value-of select="./name"/> </xsl:attribute>
-			</field>
-		</field>
-	</xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/vocabulary.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/vocabulary.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/vocabulary.xsl	(nonexistent)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	<xsl:output method="xml" indent="yes" encoding="UTF-8"/>
-
-	<xsl:template match="/">
-	<RESOURCE_PROFILE>
-	    <HEADER>
-		<RESOURCE_IDENTIFIER value=""/>
-		<RESOURCE_TYPE value="VocabularyDSResourceType"/>
-		<RESOURCE_KIND value="VocabularyDSResources"/>
-		<RESOURCE_URI value="String"/>
-		<DATE_OF_CREATION value="2008-06-25T14:50:49+02:00"/>
-	    </HEADER>
-	    <BODY>
-		<CONFIGURATION>
-		    <VOCABULARY_NAME>Index Vocabulary</VOCABULARY_NAME>
-		    <VOCABULARY_DESCRIPTION>General Vocabulary</VOCABULARY_DESCRIPTION>
-			<TERMS>
-
-			<xsl:apply-templates select="/response/results"/>
-			</TERMS>
-		</CONFIGURATION>
-	     </BODY>
-	</RESOURCE_PROFILE>
-	</xsl:template>
-
-	<xsl:template match="/response/results">
-		<xsl:for-each select="result">
-			<xsl:choose>
-				<xsl:when test="encoding = 'openaire____::fb98a192f6a055ba495ef414c330834b'">
-					<TERM native_name="" code="openaire____::fb98a192f6a055ba495ef414c330834b" english_name="Other Resources">
-						<SYNONYMS/>
-					</TERM>
-				</xsl:when>
-				<xsl:otherwise>
-					<TERM native_name="">
-						<xsl:attribute name="code"><xsl:value-of select="encoding"/></xsl:attribute>
-						<xsl:attribute name="english_name"><xsl:value-of select="value"/></xsl:attribute>
-						<SYNONYMS/>
-					</TERM>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:for-each>
-
-	</xsl:template>
-</xsl:stylesheet>
-
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/funders_simple.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/funders_simple.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/funders_simple.xml	(nonexistent)
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value=""/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2008-06-25T14:50:49+02:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Funders Simple</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>Funders simple descriptions</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM code="ec__________::EC" english_name="EC" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="nhmrc_______::NHMRC" english_name="NHMRC" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="arc_________::ARC" english_name="ARC" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="fct_________::FCT" english_name="FCT" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="wt__________::WT" english_name="WT" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="nsf_________::NSF" english_name="NSF" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="sfi_________::SFI" english_name="SFI" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="irb_hr______::MSES" english_name="MSES" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="irb_hr______::CSF" english_name="CSF" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-06-25T14:50:49+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/json.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/json.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/json.xsl	(nonexistent)
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-    <!-- Turn off auto-insertion of <?xml> tag and set indenting on -->
-    <xsl:output method="text" encoding="utf-8" indent="yes"/>
-
-    <!-- strip whitespace from whitespace-only nodes -->
-    <xsl:strip-space elements="*"/>
-
-    <!-- create a key for every element in the document using its name -->
-    <xsl:key name="names" match="*" use="concat(generate-id(..),'/',name())"/>
-
-    <!-- start with the root element -->
-    <xsl:template match="/">
-        <!-- first element needs brackets around it as template does not do that -->
-        <xsl:text>{ </xsl:text>
-        <!-- call the template for elements using one unique name at a time -->
-        <xsl:apply-templates select="*[generate-id(.) = generate-id(key('names', concat(generate-id(..),'/',name()))[1])]" >
-            <xsl:sort select="name()" data-type="number"/>
-        </xsl:apply-templates>
-        <xsl:text> }</xsl:text>
-    </xsl:template>
-
-    <xsl:template name="escape-string">
-        <xsl:param name="s"/>
-        <xsl:text>"</xsl:text>
-        <xsl:call-template name="escape-bs-string">
-            <xsl:with-param name="s" select="$s"/>
-        </xsl:call-template>
-        <xsl:text>"</xsl:text>
-    </xsl:template>
-
-    <xsl:template name="escape-bs-string">
-        <xsl:param name="s"/>
-        <xsl:choose>
-            <xsl:when test="contains($s,'\')">
-                <xsl:call-template name="escape-quot-string">
-                    <xsl:with-param name="s" select="concat(substring-before($s,'\'),'\\')"/>
-                </xsl:call-template>
-                <xsl:call-template name="escape-bs-string">
-                    <xsl:with-param name="s" select="substring-after($s,'\')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:call-template name="escape-quot-string">
-                    <xsl:with-param name="s" select="$s"/>
-                </xsl:call-template>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template name="escape-quot-string">
-        <xsl:param name="s"/>
-        <xsl:choose>
-            <xsl:when test="contains($s,'&quot;')">
-                <xsl:call-template name="encode-string">
-                    <xsl:with-param name="s" select="concat(substring-before($s,'&quot;'),'\&quot;')"/>
-                </xsl:call-template>
-                <xsl:call-template name="escape-quot-string">
-                    <xsl:with-param name="s" select="substring-after($s,'&quot;')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:call-template name="encode-string">
-                    <xsl:with-param name="s" select="$s"/>
-                </xsl:call-template>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template name="encode-string">
-        <xsl:param name="s"/>
-        <xsl:choose>
-            <!-- tab -->
-            <xsl:when test="contains($s,'&#x9;')">
-                <xsl:call-template name="encode-string">
-                    <xsl:with-param name="s" select="concat(substring-before($s,'&#x9;'),'\t',substring-after($s,'&#x9;'))"/>
-                </xsl:call-template>
-            </xsl:when>
-            <!-- line feed -->
-            <xsl:when test="contains($s,'&#xA;')">
-                <xsl:call-template name="encode-string">
-                    <xsl:with-param name="s" select="concat(substring-before($s,'&#xA;'),'\n',substring-after($s,'&#xA;'))"/>
-                </xsl:call-template>
-            </xsl:when>
-            <!-- carriage return -->
-            <xsl:when test="contains($s,'&#xD;')">
-                <xsl:call-template name="encode-string">
-                    <xsl:with-param name="s" select="concat(substring-before($s,'&#xD;'),'\r',substring-after($s,'&#xD;'))"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise><xsl:value-of select="$s"/></xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <!-- this template handles elements -->
-    <xsl:template match="*">
-        <!-- count the number of elements with the same name -->
-        <xsl:variable name="kctr" select="count(key('names', concat(generate-id(..),'/',name())))"/>
-        <!-- iterate through by sets of elements with same name -->
-        <xsl:for-each select="key('names', concat(generate-id(..),'/',name()))">
-            <!-- deal with the element name and start of multiple element block -->
-            <xsl:choose>
-                <xsl:when test="($kctr > 1) and (position() = 1)">
-                    <xsl:text>"</xsl:text>
-                    <xsl:value-of select="name()"/>
-                    <xsl:text>" : [ </xsl:text>
-                </xsl:when>
-                <xsl:when test="$kctr = 1 and name()!='result'">
-                    <xsl:text>"</xsl:text>
-                    <xsl:value-of select="name()"/>
-                    <xsl:text>" : </xsl:text>
-                </xsl:when>
-                <xsl:when test="$kctr = 1 and name()='result'">
-                    <xsl:text>"</xsl:text>
-                    <xsl:value-of select="name()"/>
-                    <xsl:text>" : [</xsl:text>
-                </xsl:when>
-            </xsl:choose>
-            <!-- count number of elements, text nodes and attribute nodes -->
-            <xsl:variable name="nctr" select="count(*|text()|@*)"/>
-            <xsl:choose>
-                <xsl:when test="$nctr = 0">
-                    <!-- no contents at all -->
-                    <xsl:text>null</xsl:text>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:variable name="ctr" select="count(*)"/>
-                    <xsl:variable name="tctr" select="count(text())"/>
-                    <xsl:variable name="actr" select="count(@*)"/>
-                    <!-- there will be contents so start an object -->
-                    <xsl:text>{ </xsl:text>
-                    <!-- handle attribute nodes -->
-                    <xsl:if test="$actr > 0">
-                        <xsl:apply-templates select="@*"/>
-                        <xsl:if test="($tctr > 0) or ($ctr > 0)">
-                            <xsl:text>, </xsl:text>
-                        </xsl:if>
-                    </xsl:if>
-                    <!-- call template for child elements one unique name at a time -->
-                    <xsl:if test="$ctr > 0">
-                        <xsl:apply-templates select="*[generate-id(.) = generate-id(key('names', concat(generate-id(..),'/',name()))[1])]">
-                            <xsl:sort select="name()" data-type="number"/>
-                        </xsl:apply-templates>
-                        <xsl:if test="$tctr > 0">
-                            <xsl:text>, </xsl:text>
-                        </xsl:if>
-                    </xsl:if>
-                    <!-- handle text nodes -->
-                    <xsl:choose>
-                        <xsl:when test="$tctr = 1">
-                            <xsl:text>"$" : </xsl:text>
-                            <xsl:apply-templates select="text()"/>
-                        </xsl:when>
-                        <xsl:when test="$tctr > 1">
-                            <xsl:text>"$" : [ </xsl:text>
-                            <xsl:apply-templates select="text()"/>
-                            <xsl:text> ]</xsl:text>
-                        </xsl:when>
-                    </xsl:choose>
-                    <xsl:text> }</xsl:text>
-                </xsl:otherwise>
-            </xsl:choose>
-            <!-- special processing if we are in multiple element block -->
-            <xsl:if test="$kctr > 1">
-                <xsl:choose>
-                    <xsl:when test="position() = last()">
-                        <xsl:text> ]</xsl:text>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:text>, </xsl:text>
-                    </xsl:otherwise>
-                </xsl:choose>
-            </xsl:if>
-            <xsl:if test="$kctr = 1 and name()='result'">
-                <xsl:text> ]</xsl:text>
-            </xsl:if>
-        </xsl:for-each>
-        <xsl:if test="position() != last()">
-            <xsl:text>, </xsl:text>
-        </xsl:if>
-    </xsl:template>
-
-    <!-- this template handle text nodes -->
-    <xsl:template match="text()">
-        <xsl:variable name="t" select="." />
-        <xsl:choose>
-            <!-- test to see if it is a number -->
-            <xsl:when test="string(number($t)) != 'NaN' and not(starts-with($t,'+')) and (not(local-name(..)='code') and not(local-name(..)='subject'))">
-                <xsl:value-of select="$t"/>
-            </xsl:when>
-            <!-- deal with any case booleans -->
-            <xsl:when test="translate($t, 'TRUE', 'true') = 'true'">
-                <xsl:text>true</xsl:text>
-            </xsl:when>
-            <xsl:when test="translate($t, 'FALSE', 'false') = 'false'">
-                <xsl:text>false</xsl:text>
-            </xsl:when>
-            <!-- must be text -->
-            <xsl:otherwise>
-                <xsl:text>"</xsl:text>
-                <xsl:call-template name="escape-bs-string">
-                    <xsl:with-param name="s" select="$t"/>
-                </xsl:call-template>
-                <xsl:text>"</xsl:text>
-            </xsl:otherwise>
-        </xsl:choose>
-        <xsl:if test="position() != last()">
-            <xsl:text>, </xsl:text>
-        </xsl:if>
-    </xsl:template>
-
-    <!-- this template handles attribute nodes -->
-    <xsl:template match="@*">
-        <!-- attach prefix to attribute names -->
-        <xsl:text>"@</xsl:text>
-        <xsl:value-of select="name()"/>
-        <xsl:text>" : </xsl:text>
-        <xsl:variable name="t" select="." />
-        <xsl:choose>
-            <xsl:when test="translate($t, 'TRUE', 'true') = 'true'">
-                <xsl:text>true</xsl:text>
-            </xsl:when> 
-            <xsl:when test="translate($t, 'FALSE', 'false') = 'false'">
-                <xsl:text>false</xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:text>"</xsl:text>
-                <xsl:value-of select="$t"/>
-                <xsl:text>"</xsl:text>
-            </xsl:otherwise>
-        </xsl:choose>
-        <xsl:if test="position() != last()">
-            <xsl:text>, </xsl:text>
-        </xsl:if>
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/community.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/community.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/community.xml	(nonexistent)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value=""/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2008-06-25T14:50:49+02:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Community</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>community descriptions</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM code="egi" english_name="EGI" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="fet-fp7" english_name="FET" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-06-25T14:50:49+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/programmes_simple.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/programmes_simple.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/programmes_simple.xml	(nonexistent)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value=""/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2008-06-25T14:50:49+02:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Programmes Simple</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>Programmes simple descriptions</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM code="ec__________::EC::FP7::SP1" english_name="SP1" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP2" english_name="SP2" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP3" english_name="SP3" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP4" english_name="SP4" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP5" english_name="SP5" native_name="">
-                    <SYNONYMS/>
-                </TERM>              
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-06-25T14:50:49+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/sygma.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/sygma.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/sygma.xsl	(nonexistent)
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                                xmlns="http://namespace.openaire.eu/sygma">
-    <xsl:output method="xml" indent="yes" encoding="UTF-8"/>
-
-    <xsl:template match = "/">
-        <response>
-            <xsl:apply-templates select="response/header"/>
-            <publications>
-                <xsl:apply-templates select="//result"/>
-            </publications>
-        </response>
-    </xsl:template>
-
-    <xsl:template match="response/header">
-        <header>
-            <size><xsl:value-of select="size"/></size>
-            <page><xsl:value-of select="page"/></page>
-            <total><xsl:value-of select="total"/></total>
-        </header>
-    </xsl:template>
-
-
-    <xsl:template match="result">
-        <publication>
-            <openaireid><xsl:value-of select="field[@name='resultId']/@value"/></openaireid>
-            <xsl:for-each select="field[@name='pid']">
-                <xsl:if test="field[@name='classid' and @value='doi']/@value = 'doi'">
-                    <doi>
-                        <xsl:value-of select="field[@name='value']/@value"/>
-                    </doi>
-                </xsl:if>
-            </xsl:for-each>
-            <description><xsl:value-of select="field[@name='description']/@value"/></description>
-            <publicationtype><xsl:value-of select="field[@name='datasource'][1]/field[@name='typename']/@value"/></publicationtype>
-            <title><xsl:value-of select="field[@name='title']/@value"/></title>
-            <authors>
-                <xsl:for-each select="field[@name='hasAuthor']">
-                    <xsl:sort select="./field[@name='ranking']/@value" data-type="number"/>
-                    <author><xsl:value-of select="field[@name='fullname']/@value"/></author>
-                </xsl:for-each>
-            </authors>
-            <xsl:for-each select="field[@name='source']">
-                <sourcejournal><xsl:value-of select="@value"/></sourcejournal>
-            </xsl:for-each>
-            <dateofacceptance><xsl:value-of select="field[@name='dateofacceptance']/@value"/></dateofacceptance>
-            <xsl:for-each select="field[@name='datasource']">
-                <xsl:for-each select="field[@name='url']">
-                    <webresource><xsl:value-of select="@value"/></webresource>
-                </xsl:for-each>
-            </xsl:for-each>
-            <bestlicense><xsl:value-of select="field[@name='bestaccessright']/@value"/></bestlicense>
-        </publication>
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/datasource_vocabulary.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/datasource_vocabulary.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/datasource_vocabulary.xsl	(nonexistent)
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	<xsl:output method="xml" indent="yes" encoding="UTF-8"/>
-		
-	<xsl:template match="/">
-	<RESOURCE_PROFILE>
-	    <HEADER>
-		<RESOURCE_IDENTIFIER value=""/>
-		<RESOURCE_TYPE value="VocabularyDSResourceType"/>
-		<RESOURCE_KIND value="VocabularyDSResources"/>
-		<RESOURCE_URI value="String"/>
-		<DATE_OF_CREATION value="2008-06-25T14:50:49+02:00"/>
-	    </HEADER>
-	    <BODY>
-		<CONFIGURATION>
-		    <VOCABULARY_NAME>Datasources</VOCABULARY_NAME>
-		    <VOCABULARY_DESCRIPTION>Datasources Vocabulary</VOCABULARY_DESCRIPTION>
-			<TERMS>
-
-			<xsl:apply-templates select="/response/results"/>
-			</TERMS>
-		</CONFIGURATION> 
-	     </BODY>
-	</RESOURCE_PROFILE>
-
-
-	</xsl:template>
-
-	<xsl:template match="/response/results">
-		<xsl:for-each select="result">
-			<xsl:choose>
-				<xsl:when test="encoding = 'openaire____::fb98a192f6a055ba495ef414c330834b'">
-					<TERM native_name="" encoding="openaire____::fb98a192f6a055ba495ef414c330834b" english_name="Other Resources">
-						<SYNONYMS/>
-					</TERM>
-				</xsl:when>
-				<xsl:otherwise>
-					<TERM native_name="">
-						<xsl:attribute name="encoding"><xsl:value-of select="field[@name='encoding']/@value"/></xsl:attribute>
-						<xsl:attribute name="english_name"><xsl:value-of select="field[@name='value']/@value"/></xsl:attribute>
-						<SYNONYMS/>
-		      			  </TERM>
-				</xsl:otherwise>
-			</xsl:choose>
-		 </xsl:for-each>
-
-	</xsl:template>
-</xsl:stylesheet>
-	
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/project_mini.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/project_mini.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/project_mini.xsl	(nonexistent)
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-xmlns:dri="http://www.driver-repository.eu/namespace/dri"
-xmlns:oaf="http://namespace.openaire.eu/oaf"
-xmlns:dc="http://purl.org/dc/elements/1.1/">
-<xsl:output method="xml" indent="yes" encoding="UTF-8"/>
-
-<xsl:template match = "/">
-<result type ="result">
-	<xsl:apply-templates select="//header"/>
-	<xsl:apply-templates select="//oaf:project"/>
-</result>
-</xsl:template>
-
-<xsl:template match = "header">
-	<encoding>
-			<xsl:value-of select='./dri:objIdentifier'/>
-		</encoding>
-</xsl:template>
-
-
-
-<xsl:template match = "oaf:project">
-	<xsl:choose>
-		<xsl:when test="./acronym != '' and ./acronym != 'UNKNOWN'">
-			<value>
-				<xsl:value-of select="./acronym"/>
-			</value>
-		</xsl:when>
-		<xsl:otherwise>
-				<value>
-					<xsl:value-of select="./title"/>
-				</value>
-		</xsl:otherwise>
-	</xsl:choose>				
-</xsl:template>
-
-</xsl:stylesheet>
-
-
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/publication_csv_notitle.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/publication_csv_notitle.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/publication_csv_notitle.xsl	(nonexistent)
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-    <!-- Turn off auto-insertion of <?xml> tag and set indenting on -->
-    <xsl:output method="text" encoding="utf-8" omit-xml-declaration="yes" media-type="text/csv" />
-
-    <!-- strip whitespace from whitespace-only nodes -->
-    <xsl:strip-space elements="*"/>
-
-    <xsl:template match = "/">
-<!--
-        <xsl:text disable-output-escaping="yes">Title,Authors,Publication Year,DOI,Permanent identifier,Publication type,Journal,Funder,Project Name (GA Number),Access&#xD;</xsl:text>
--->
-        <xsl:apply-templates select="//result"/>
-    </xsl:template>
-
-    <!-- Title, Authors, Description, Year, DOI, Permanent identifier, Publication type, Journal, Project Name, GA number, Access -->
-    <xsl:template match="result">
-        <xsl:choose>
-            <xsl:when test="field[@name='project']">
-                <xsl:for-each select="field[@name='project']">
-                    <!-- title -->
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:value-of select="../field[@name='title']/@value"/>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>,</xsl:text>
-
-                    <!-- authors -->
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:for-each select="../field[@name='hasAuthor']">
-                        <xsl:value-of select="field[@name='fullname']/@value"/>
-                        <xsl:if test="not(position()=last())">
-                            <xsl:text>;</xsl:text>
-                        </xsl:if>
-                    </xsl:for-each>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>,</xsl:text>
-
-                    <!-- description
-                    <xsl:text>&quot;</xsl:text>
-                        <xsl:value-of select="field[@name='description']/@value"/>
-                        <xsl:if test="position() != last()"><xsl:text>&#160;</xsl:text></xsl:if>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>,</xsl:text>
-            -->
-                    <!-- year -->
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:value-of select="../field[@name='dateofacceptance']/@value"/>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>,</xsl:text>
-
-                    <!-- DOI -->
-                    <xsl:for-each select="../field[@name='pid']">
-                        <xsl:if test="field[@name='classid' and @value='doi']/@value = 'doi'">
-                            <xsl:text>&quot;</xsl:text>
-                            <xsl:value-of select="field[@name='value']/@value"/>
-                            <xsl:text>&quot;</xsl:text>
-                        </xsl:if>
-                    </xsl:for-each>
-                    <xsl:text>,</xsl:text>
-
-                    <!-- Permanent Identifier -->
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:value-of select="../field[@name='datasource'][1]/field[@name='url']/@value"/>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>,</xsl:text>
-
-                    <!-- Publication type -->
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:value-of select="../field[@name='datasource'][1]/field[@name='typename']/@value"/>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>,</xsl:text>
-
-                    <!-- journal -->
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:for-each select="../field[@name='source']">
-                        <xsl:value-of select="replace(@value, '&lt;/?\w+[^&lt;]*&gt;', '')"/>
-                    </xsl:for-each>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>,</xsl:text>
-
-                    <!-- Funder -->
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:for-each select="field[@name='funding']/field[@name='funder']">
-                        <xsl:value-of select="@value"/>
-                    </xsl:for-each>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>,</xsl:text>
-
-                    <!-- project name -->
-                    <xsl:text>&quot;</xsl:text>
-                    <!-- project name -->
-                    <xsl:choose>
-                        <xsl:when test="field[@name='projectacronym']/@value != ''" >
-                            <xsl:value-of select="field[@name='projectacronym']/@value"/>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:value-of select="field[@name='projecttitle']/@value"/>
-                        </xsl:otherwise>
-                    </xsl:choose>
-                    <xsl:if test="field[@name='projectcode']/@value!= ''">
-                        <xsl:value-of select="concat('(',field[@name='projectcode']/@value,')')"/>
-                    </xsl:if>
-
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>,</xsl:text>
-
-                    <!--access -->
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:value-of select="../field[@name='bestaccessright']/@value"/>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>&#xD;</xsl:text>
-
-                </xsl:for-each>
-            </xsl:when>
-            <xsl:otherwise>
-                <!-- title -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:value-of select="field[@name='title']/@value"/>
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>,</xsl:text>
-
-                <!-- authors -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:for-each select="field[@name='hasAuthor']">
-                    <xsl:sort select="./field[@name='ranking']/@value" data-type="number"/>
-                    <xsl:value-of select="field[@name='fullname']/@value"/>
-                    <xsl:if test="not(position()=last())">
-                        <xsl:text>;</xsl:text>
-                    </xsl:if>
-                </xsl:for-each>
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>,</xsl:text>
-
-                <!-- year -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:value-of select="field[@name='dateofacceptance']/@value"/>
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>,</xsl:text>
-
-                <!-- DOI -->
-                <xsl:for-each select="field[@name='pid']">
-                    <xsl:if test="field[@name='classid' and @value='doi']/@value = 'doi'">
-                        <xsl:text>&quot;</xsl:text>
-                        <xsl:value-of select="field[@name='value']/@value"/>
-                        <xsl:text>&quot;</xsl:text>
-                    </xsl:if>
-                </xsl:for-each>
-                <xsl:text>,</xsl:text>
-
-                <!-- Permanent Identifier -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:value-of select="field[@name='datasource'][1]/field[@name='url']/@value"/>
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>,</xsl:text>
-
-                <!-- Publication type -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:value-of select="field[@name='datasource'][1]/field[@name='typename']/@value"/>
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>,</xsl:text>
-
-                <!-- journal -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:for-each select="field[@name='source']">
-                    <xsl:value-of select="@value"/>
-                </xsl:for-each>
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>,</xsl:text>
-
-                <!-- Funder -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>,</xsl:text>
-
-                <!-- project name -->
-                <xsl:text>&quot;</xsl:text>
-                <!-- project name -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>,</xsl:text>
-
-                <!--access -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:value-of select="../field[@name='bestaccessright']/@value"/>
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>&#xD;</xsl:text>
-            </xsl:otherwise>
-        </xsl:choose>
-
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/csv_publication.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/csv_publication.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/csv_publication.xsl	(nonexistent)
@@ -1,127 +0,0 @@
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:dri="http://www.driver-repository.eu/namespace/dri"
-                xmlns:oaf="http://namespace.openaire.eu/oaf"
-                xmlns:dc="http://purl.org/dc/elements/1.1/">
-
-    <!-- Turn off auto-insertion of <?xml> tag and set indenting on -->
-    <xsl:output method="text" encoding="utf-8" omit-xml-declaration="yes" media-type="text/csv" />
-
-    <!-- strip whitespace from whitespace-only nodes -->
-    <xsl:strip-space elements="*"/>
-
-    <xsl:variable name="apos">'</xsl:variable>
-
-    <xsl:template match = "/">
-        <xsl:apply-templates select="//oaf:result"/>
-    </xsl:template>
-
-    <!-- Title, Authors, Publication Year, DOI, Funder, Project Name (GA Number), Access -->
-
-    <xsl:template match="oaf:result">
-
-        <!-- Title -->
-        <xsl:text>"</xsl:text>
-        <xsl:call-template name="escape-quot-string">
-            <xsl:with-param name="s" select="title"/>
-        </xsl:call-template>
-        <xsl:text>",</xsl:text>
-
-        <!-- Authors -->
-        <xsl:text>"</xsl:text>
-        <xsl:for-each select="creator">
-            <xsl:sort select="@rank"/>
-            <xsl:value-of select="."/>
-            <xsl:if test="not(position()=last())">
-                <xsl:text>;</xsl:text>
-            </xsl:if>
-        </xsl:for-each>
-        <xsl:text>"</xsl:text>
-        <xsl:text>,</xsl:text>
-
-        <!-- Publication Year -->
-        <xsl:value-of select="dateofacceptance"/>
-        <xsl:text>,</xsl:text>
-
-        <!-- DOI -->
-        <xsl:apply-templates select="pid"/>
-        <xsl:text>,</xsl:text>
-
-        <!-- Funder|Project Name (GA Number) -->
-        <xsl:for-each select="rels/rel/to[@class='isProducedBy']">
-            <xsl:value-of select="../funding/funder/@shortname"/>
-            <xsl:text>|</xsl:text>
-            <xsl:choose>
-                <xsl:when test="../acronym">
-                    <xsl:value-of select="../acronym"/>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:text>"</xsl:text>
-                    <xsl:value-of select="../title"/>
-                    <xsl:text>"</xsl:text>
-                </xsl:otherwise>
-            </xsl:choose>
-            <xsl:text>(</xsl:text>
-            <xsl:value-of select="../code"/>
-            <xsl:text>)</xsl:text>
-            <xsl:if test="not(position()=last())">
-                <xsl:text>;</xsl:text>
-            </xsl:if>
-        </xsl:for-each>
-        <xsl:text>,</xsl:text>
-
-        <!-- Access -->
-        <xsl:value-of select="bestaccessright/@classname"/>
-        <xsl:text>&#xd;</xsl:text>
-
-    </xsl:template>
-
-    <xsl:template match="pid[@classid='doi']">
-        <xsl:value-of select="."/>
-    </xsl:template>
-
-    <xsl:template name="escape-quot-string">
-        <xsl:param name="s"/>
-        <xsl:choose>
-            <xsl:when test="contains($s,'&quot;')">
-                <xsl:call-template name="encode-string">
-                    <xsl:with-param name="s" select="concat(substring-before($s,'&quot;'),$apos)"/>
-                </xsl:call-template>
-                <xsl:call-template name="escape-quot-string">
-                    <xsl:with-param name="s" select="substring-after($s,'&quot;')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:call-template name="encode-string">
-                    <xsl:with-param name="s" select="$s"/>
-                </xsl:call-template>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template name="encode-string">
-        <xsl:param name="s"/>
-        <xsl:choose>
-            <!-- tab -->
-            <xsl:when test="contains($s,'&#x9;')">
-                <xsl:call-template name="encode-string">
-                    <xsl:with-param name="s" select="concat(substring-before($s,'&#x9;'),'\t',substring-after($s,'&#x9;'))"/>
-                </xsl:call-template>
-            </xsl:when>
-            <!-- line feed -->
-            <xsl:when test="contains($s,'&#xA;')">
-                <xsl:call-template name="encode-string">
-                    <xsl:with-param name="s" select="concat(substring-before($s,'&#xA;'),'\n',substring-after($s,'&#xA;'))"/>
-                </xsl:call-template>
-            </xsl:when>
-            <!-- carriage return -->
-            <xsl:when test="contains($s,'&#xD;')">
-                <xsl:call-template name="encode-string">
-                    <xsl:with-param name="s" select="concat(substring-before($s,'&#xD;'),'\r',substring-after($s,'&#xD;'))"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise><xsl:value-of select="$s"/></xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/sygma_dataset.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/sygma_dataset.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/sygma_dataset.xsl	(nonexistent)
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                              xmlns="http://namespace.openaire.eu/sygma">
-
-    <xsl:output method="xml" indent="yes" encoding="UTF-8"/>
-
-    <xsl:template match = "/">
-        <response>
-            <xsl:apply-templates select="response/header"/>
-            <datasets>
-                <xsl:apply-templates select="//result"/>
-            </datasets>
-        </response>
-    </xsl:template>
-
-    <xsl:template match="response/header">
-        <header>
-            <size><xsl:value-of select="size"/></size>
-            <page><xsl:value-of select="page"/></page>
-            <total><xsl:value-of select="total"/></total>
-        </header>
-    </xsl:template>
-
-<!--    <xsl:template match="field[@name='pid']/field[@name='classid' and @value='doi']" name="idnode"></xsl:template> -->
-
-    <xsl:template match="result">
-        <dataset>
-            <openaireid><xsl:value-of select="field[@name='resultId']/@value"/></openaireid>
-            <authors>
-                <xsl:for-each select="field[@name='hasAuthor']">
-                    <author><xsl:value-of select="field[@name='fullname']/@value"/></author>
-                </xsl:for-each>
-            </authors>
-            <doi>
-                <xsl:for-each select="field[@name='pid']">
-                    <xsl:if test="field[@name='classid' and @value='doi']/@value = 'doi'">
-                        <xsl:value-of select="field[@name='value']/@value"/>
-                    </xsl:if>
-                </xsl:for-each>
-            </doi>
-            <description><xsl:value-of select="field[@name='description']/@value"/></description>
-            <title><xsl:value-of select="field[@name='title']/@value"/></title>
-            <xsl:for-each select="field[@name='datasource']">
-                <xsl:for-each select="field[@name='url']">
-                    <webresource><xsl:value-of select="@value"/></webresource>
-                </xsl:for-each>
-            </xsl:for-each>
-            <bestlicense><xsl:value-of select="field[@name='bestaccessright']/@value"/></bestlicense>
-            <relatedpublications>
-                    <xsl:for-each select="field[@name='isRelatedTo']">
-                        <xsl:if test="field[@name='resulttypeid']/@value = 'publication'">
-                            <publication>
-                                <openaireid><xsl:value-of select="field['resultid']/@value"/></openaireid>
-                                <doi></doi>
-                                <title><xsl:value-of select="field[@name='title']/@value"/></title>
-                                <authors></authors>
-                                <sourcejournal></sourcejournal>
-                                <dateofacceptance></dateofacceptance>
-                                <webresource></webresource>
-                                <bestlicense></bestlicense>
-                            </publication>
-                        </xsl:if>
-                    </xsl:for-each>
-            </relatedpublications>
-        </dataset>
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/areas.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/areas.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/areas.xml	(nonexistent)
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value=""/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2008-06-25T14:50:49+02:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Programmes</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>Programmes descriptions</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM code="ec__________::EC::FP7::SP2::ERC" english_name="EC::FP7::Ideas::ERC" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP3::PEOPLE" english_name="EC::FP7::People::PEOPLE" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP1::ICT" english_name="EC::FP7::Cooperation::ICT" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP1::TPT" english_name="EC::FP7::Cooperation::TPT" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP1::ENV" english_name="EC::FP7::Cooperation::ENV" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP1::KBBE" english_name="EC::FP7::Cooperation::KBBE" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                 <TERM code="ec__________::EC::FP7::SP1::HEALTH" english_name="EC::FP7::Cooperation::HEALTH" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP1::NMP" english_name="EC::FP7::Cooperation::NMP" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP1::ENERGY" english_name="EC::FP7::Cooperation::ENERGY" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP1::SPA" english_name="EC::FP7::Cooperation::SPA" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP1::SSH" english_name="EC::FP7::Cooperation::SSH" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP1::GA" english_name="EC::FP7::Cooperation::GA" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP1::SEC" english_name="EC::FP7::Cooperation::SEC" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP4::SME" english_name="EC::FP7::Capacities::SME" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP4::REGIONS" english_name="EC::FP7::Capacities::REGIONS" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                 <TERM code="ec__________::EC::FP7::SP4::INFRA" english_name="EC::FP7::Capacities::INFRA" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP4::INCO" english_name="EC::FP7::Capacities::INCO" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP4::REGPOT" english_name="EC::FP7::Capacities::REGPOT" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP4::SiS" english_name="EC::FP7::Capacities::SiS" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP5::Fission" english_name="EC::FP7::Euratom::Fission" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::FP7::SP5::Fusion" english_name="EC::FP7::Euratom::Fusion" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-06-25T14:50:49+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/project_funders.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/project_funders.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/project_funders.xml	(nonexistent)
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value=""/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2008-06-25T14:50:49+02:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Programmes</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>Programmes descriptions</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM code="corda_______::FP7" english_name="EC - FP7" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="wt__________::WT" native_name="" english_name="Wellcome Trust">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec_h2020fund::H2020" native_name="" english_name="EC - H2020">
-                    <SYNONYMS/>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-06-25T14:50:49+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/project_html.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/project_html.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/project_html.xsl	(nonexistent)
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:dri="http://www.driver-repository.eu/namespace/dri"
-                xmlns:oaf="http://namespace.openaire.eu/oaf"
-                xmlns:dc="http://purl.org/dc/elements/1.1/">
-
-    <!-- Turn off auto-insertion of <?xml> tag and set indenting on -->
-    <xsl:output method="html" encoding="utf-8" omit-xml-declaration="yes" />
-
-    <!-- strip whitespace from whitespace-only nodes -->
-    <xsl:strip-space elements="*"/>
-
-    <!-- Project title, Project Acronym, Project ID, Funder, Funding Stream, Funding Substream level 1, Funding Substream level 2, SC39, Start Date, End Date -->
-
-    <xsl:template match = "/">
-        <table>
-            <thead>
-                <tr>
-                    <th>Project title</th>
-                    <th>Project Acronym</th>
-                    <th>Project ID</th>
-                    <th>Funder</th>
-                    <th>Funding Stream</th>
-                    <th>Funding Substream level 1</th>
-                    <th>Funding Substream level 2</th>
-                    <th>SC39</th>
-                    <th>Start Date</th>
-                    <th>End Date</th>
-                </tr>
-            </thead>
-            <tbody>
-                <xsl:apply-templates select="//oaf:project"/>
-            </tbody>
-        </table>
-    </xsl:template>
-
-    <xsl:template match="//oaf:project">
-        <xsl:for-each select="fundingtree">
-            <tr>
-                <!-- Project title -->
-                <td>
-                    <xsl:value-of select="../title"/>
-                </td>
-
-                <!-- Project Acronym -->
-                <td>
-                    <xsl:value-of select="../acronym"/>
-                </td>
-
-                <!-- Project ID -->
-                <td>
-                    <xsl:value-of select="../code"/>
-                </td>
-
-                <!-- Funder -->
-                <td>
-                    <xsl:value-of select="funder/shortname"/>
-                </td>
-
-                <!-- Funding Stream -->
-                <td>
-                    <xsl:value-of select=".//funding_level_0/name"/>
-                </td>
-
-                <!-- Funding Substream Level 1 -->
-                <td>
-                    <xsl:value-of select=".//funding_level_1/name"/>
-                </td>
-
-                <!-- Funding Substream Level 2 -->
-                <td>
-                    <xsl:value-of select=".//funding_level_2/name"/>
-                </td>
-
-                <!-- SC39 -->
-                <td>
-                    <xsl:value-of select="../ecsc39"/>
-                </td>
-
-                <!-- Start Date -->
-                <td>
-                <xsl:value-of select="../startdate"/>
-                </td>
-
-                <!-- End Date -->
-                <td>
-                    <xsl:value-of select="../enddate"/>
-                </td>
-
-            </tr>
-        </xsl:for-each>
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/csv.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/csv.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/csv.xsl	(nonexistent)
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-    <!-- Turn off auto-insertion of <?xml> tag and set indenting on -->
-    <xsl:output method="text" encoding="utf-8" omit-xml-declaration="yes" media-type="text/csv" />
-
-    <!-- strip whitespace from whitespace-only nodes -->
-    <xsl:strip-space elements="*"/>
-
-    <xsl:template match = "/">
-              <xsl:text disable-output-escaping="yes">Title,Authors,Publication Year,DOI,Download From,Publication type,Journal,Funder,Project Name (GA Number),Access&#xD;</xsl:text>
-              <xsl:apply-templates select="//result"/>
-    </xsl:template>
-
-    <!-- Title, Authors, Description, Year, DOI, Permanent identifier, Publication type, Journal, Project Name, GA number, Access -->
-    <xsl:template match="result">
-        <xsl:choose>
-            <xsl:when test="field[@name='project']">
-                <xsl:for-each select="field[@name='project']">
-                    <!-- title -->
-                    <xsl:text>&quot;</xsl:text>
-                        <xsl:value-of select="../field[@name='title']/@value"/>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>,</xsl:text>
-
-                    <!-- authors -->
-                    <xsl:text>&quot;</xsl:text>
-                        <xsl:for-each select="../field[@name='hasAuthor']">
-                            <xsl:sort select="field[@name='ranking']/@value" data-type="number"/>
-                            <xsl:value-of select="field[@name='fullname']/@value"/>
-                            <xsl:if test="not(position()=last())">
-                                <xsl:text>;</xsl:text>
-                            </xsl:if>
-                        </xsl:for-each>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>,</xsl:text>
-
-                    <!-- description
-                    <xsl:text>&quot;</xsl:text>
-                        <xsl:value-of select="field[@name='description']/@value"/>
-                        <xsl:if test="position() != last()"><xsl:text>&#160;</xsl:text></xsl:if>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>,</xsl:text>
-            -->
-                    <!-- year -->
-                    <xsl:text>&quot;</xsl:text>
-                        <xsl:value-of select="../field[@name='dateofacceptance']/@value"/>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>,</xsl:text>
-
-                    <!-- DOI -->
-                    <xsl:for-each select="../field[@name='pid']">
-                        <xsl:if test="field[@name='classid' and @value='doi']/@value = 'doi'">
-                            <xsl:text>&quot;</xsl:text>
-                            <xsl:value-of select="field[@name='value']/@value"/>
-                            <xsl:text>&quot;</xsl:text>
-                        </xsl:if>
-                    </xsl:for-each>
-                    <xsl:text>,</xsl:text>
-
-                    <!-- Download From -->
-                    <xsl:text>&quot;</xsl:text>
-                        <xsl:value-of select="../field[@name='datasource'][1]/field[@name='url']/@value"/>
-                        <xsl:text>&quot;</xsl:text>
-                    <xsl:text>,</xsl:text>
-
-                    <!-- Publication type -->
-                    <xsl:text>&quot;</xsl:text>
-                        <xsl:value-of select="../field[@name='datasource'][1]/field[@name='typename']/@value"/>
-                        <xsl:text>&quot;</xsl:text>
-                    <xsl:text>,</xsl:text>
-
-                    <!-- journal -->
-                    <xsl:text>&quot;</xsl:text>
-                        <xsl:for-each select="../field[@name='source']">
-                            <xsl:value-of select="replace(@value, '&lt;/?\w+[^&lt;]*&gt;', '')"/>
-                        </xsl:for-each>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>,</xsl:text>
-
-                    <!-- Funder -->
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:for-each select="field[@name='funding']/field[@name='funder']">
-                        <xsl:value-of select="@value"/>
-                    </xsl:for-each>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>,</xsl:text>
-
-                    <!-- project name -->
-                    <xsl:text>&quot;</xsl:text>
-                    <!-- project name -->
-                    <xsl:choose>
-                        <xsl:when test="field[@name='projectacronym']/@value != ''" >
-                            <xsl:value-of select="field[@name='projectacronym']/@value"/>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:value-of select="field[@name='projecttitle']/@value"/>
-                        </xsl:otherwise>
-                    </xsl:choose>
-                    <xsl:if test="field[@name='projectcode']/@value!= ''">
-                            <xsl:value-of select="concat('(',field[@name='projectcode']/@value,')')"/>
-                    </xsl:if>
-
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>,</xsl:text>
-
-                    <!--access -->
-                    <xsl:text>&quot;</xsl:text>
-                        <xsl:value-of select="../field[@name='bestaccessright']/@value"/>
-                        <xsl:text>&quot;</xsl:text>
-                    <xsl:text>&#xD;</xsl:text>
-
-                </xsl:for-each>
-        </xsl:when>
-        <xsl:otherwise>
-            <!-- title -->
-            <xsl:text>&quot;</xsl:text>
-            <xsl:value-of select="field[@name='title']/@value"/>
-            <xsl:text>&quot;</xsl:text>
-            <xsl:text>,</xsl:text>
-
-            <!-- authors -->
-            <xsl:text>&quot;</xsl:text>
-            <xsl:for-each select="field[@name='hasAuthor']">
-                <xsl:value-of select="field[@name='fullname']/@value"/>
-                <xsl:if test="not(position()=last())">
-                    <xsl:text>;</xsl:text>
-                </xsl:if>
-            </xsl:for-each>
-            <xsl:text>&quot;</xsl:text>
-            <xsl:text>,</xsl:text>
-
-            <!-- year -->
-            <xsl:text>&quot;</xsl:text>
-            <xsl:value-of select="field[@name='dateofacceptance']/@value"/>
-            <xsl:text>&quot;</xsl:text>
-            <xsl:text>,</xsl:text>
-
-            <!-- DOI -->
-            <xsl:for-each select="field[@name='pid']">
-                <xsl:if test="field[@name='classid' and @value='doi']/@value = 'doi'">
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:value-of select="field[@name='value']/@value"/>
-                    <xsl:text>&quot;</xsl:text>
-                </xsl:if>
-            </xsl:for-each>
-            <xsl:text>,</xsl:text>
-
-            <!-- Permanent Identifier -->
-            <xsl:text>&quot;</xsl:text>
-            <xsl:value-of select="field[@name='datasource'][1]/field[@name='url']/@value"/>
-            <xsl:text>&quot;</xsl:text>
-            <xsl:text>,</xsl:text>
-
-            <!-- Publication type -->
-            <xsl:text>&quot;</xsl:text>
-            <xsl:value-of select="field[@name='datasource'][1]/field[@name='typename']/@value"/>
-            <xsl:text>&quot;</xsl:text>
-            <xsl:text>,</xsl:text>
-
-            <!-- journal -->
-            <xsl:text>&quot;</xsl:text>
-            <xsl:for-each select="field[@name='source']">
-                <xsl:value-of select="@value"/>
-            </xsl:for-each>
-            <xsl:text>&quot;</xsl:text>
-            <xsl:text>,</xsl:text>
-
-            <!-- Funder -->
-            <xsl:text>&quot;</xsl:text>
-            <xsl:text>&quot;</xsl:text>
-            <xsl:text>,</xsl:text>
-
-            <!-- project name -->
-            <xsl:text>&quot;</xsl:text>
-            <!-- project name -->
-            <xsl:text>&quot;</xsl:text>
-            <xsl:text>,</xsl:text>
-
-            <!--access -->
-            <xsl:text>&quot;</xsl:text>
-            <xsl:value-of select="../field[@name='bestaccessright']/@value"/>
-            <xsl:text>&quot;</xsl:text>
-            <xsl:text>&#xD;</xsl:text>
-        </xsl:otherwise>
-    </xsl:choose>
-
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/project.properties
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/project.properties	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/project.properties	(nonexistent)
@@ -1,3 +0,0 @@
-version=${project.version}
-artifactId=${project.artifactId}
-
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/html_publication_special.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/html_publication_special.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/html_publication_special.xsl	(nonexistent)
@@ -1,101 +0,0 @@
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:dri="http://www.driver-repository.eu/namespace/dri"
-                xmlns:oaf="http://namespace.openaire.eu/oaf"
-                xmlns:dc="http://purl.org/dc/elements/1.1/">
-
-    <!-- Turn off auto-insertion of <?xml> tag and set indenting on -->
-    <xsl:output method="html" encoding="utf-8" omit-xml-declaration="yes" media-type="text/html" />
-
-    <!-- strip whitespace from whitespace-only nodes -->
-    <xsl:strip-space elements="*"/>
-
-    <xsl:template match = "/">
-        <xsl:apply-templates select="//oaf:result"/>
-    </xsl:template>
-
-    <!-- Title, Authors, Publication Year, DOI, Download From, Publication Type, Journal, Funder, Project Name (GA Number), Access -->
-
-    <xsl:template match="oaf:result">
-        <tr>
-            <!-- Title -->
-            <td>
-                <xsl:value-of select="title"/>
-            </td>
-
-            <!-- Authors -->
-            <td>
-                <xsl:for-each select="rels/rel/to[@class='hasAuthor']">
-                    <xsl:sort select="field[@name='ranking']/@value"/>
-                    <xsl:value-of select="../fullname"/>
-                    <xsl:if test="not(position()=last())">
-                        <xsl:text>;</xsl:text>
-                    </xsl:if>
-                </xsl:for-each>
-            </td>
-
-            <!-- Publication Year -->
-            <td>
-                <xsl:value-of select="dateofacceptance"/>
-            </td>
-
-            <!-- DOI -->
-            <td>
-                <xsl:apply-templates select="pid"/>
-            </td>
-
-            <!-- Download from -->
-            <td>
-                <a target="_blank">
-                <xsl:attribute name="href">
-                    <xsl:value-of select="children/instance[1]/webresource[1]"/>
-                </xsl:attribute>
-                </a>
-            </td>
-
-            <!-- Publication Type -->
-            <td>
-                <xsl:value-of select="children/instance[1]/instancetype/@classname"/>
-            </td>
-
-            <!-- Journal -->
-            <td>
-                <xsl:value-of select="replace(source, '[&#x007F;-&#x009F;]', ' ')"/>
-            </td>
-
-            <!-- Funder|Project Name (GA Number) -->
-            <td>
-                <xsl:for-each select="rels/rel/to[@class='isProducedBy']">
-                    <xsl:value-of select="../funding/funder/@shortname"/>
-                    <xsl:text>|</xsl:text>
-                    <xsl:choose>
-                        <xsl:when test="../acronym">
-                            <xsl:value-of select="../acronym"/>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:text>"</xsl:text>
-                            <xsl:value-of select="../title"/>
-                            <xsl:text>"</xsl:text>
-                        </xsl:otherwise>
-                    </xsl:choose>
-                    <xsl:text>(</xsl:text>
-                    <xsl:value-of select="../code"/>
-                    <xsl:text>)</xsl:text>
-                    <xsl:if test="not(position()=last())">
-                        <xsl:text>;</xsl:text>
-                    </xsl:if>
-                </xsl:for-each>
-            </td>
-
-            <!-- Access -->
-            <td>
-                <xsl:value-of select="bestaccessright/@classname"/>
-            </td>
-        </tr>
-    </xsl:template>
-
-    <xsl:template match="pid[@classid='doi']">
-        <xsl:value-of select="."/>
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/project_vocabulary.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/project_vocabulary.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/project_vocabulary.xsl	(nonexistent)
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:output method="xml" indent="yes" encoding="UTF-8"/>
-
-    <xsl:template match="/">
-        <RESOURCE_PROFILE>
-            <HEADER>
-                <RESOURCE_IDENTIFIER value=""/>
-                <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-                <RESOURCE_KIND value="VocabularyDSResources"/>
-                <RESOURCE_URI value="String"/>
-                <DATE_OF_CREATION value="2008-06-25T14:50:49+02:00"/>
-            </HEADER>
-            <BODY>
-                <CONFIGURATION>
-                    <VOCABULARY_NAME>Projects</VOCABULARY_NAME>
-                    <VOCABULARY_DESCRIPTION>Projects Vocabulary</VOCABULARY_DESCRIPTION>
-                    <TERMS>
-
-                        <xsl:apply-templates select="/response/results"/>
-                    </TERMS>
-                </CONFIGURATION>
-            </BODY>
-        </RESOURCE_PROFILE>
-
-
-    </xsl:template>
-
-    <xsl:template match = "//result">
-        <xsl:choose>
-            <xsl:when test="./acronym != '' and ./acronym != 'UNKNOWN'">
-                <TERM native_name="">
-                    <xsl:attribute name="encoding"><xsl:value-of select="field[@name='encoding']/@value"/></xsl:attribute>
-                    <xsl:attribute name="english_name"><xsl:value-of select="field[@name='acronym']/@value"/></xsl:attribute>
-                    <SYNONYMS/>
-                </TERM>
-            </xsl:when>
-            <xsl:otherwise>
-                <TERM native_name="">
-                    <xsl:attribute name="encoding"><xsl:value-of select="field[@name='encoding']/@value"/></xsl:attribute>
-                    <xsl:attribute name="english_name"><xsl:value-of select="field[@name='title']/@value"/></xsl:attribute>
-                    <SYNONYMS/>
-                </TERM>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-</xsl:stylesheet>
-
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/sygma_funders.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/sygma_funders.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/sygma_funders.xml	(nonexistent)
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value=""/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2008-06-25T14:50:49+02:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>Sygma Funders Simple</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>Sygma Funders simple descriptions</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM code="ec__________::EC::FP7" english_name="FP7" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="ec__________::EC::H2020" english_name="H2020" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="wt__________::WT" english_name="WT" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-          </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-06-25T14:50:49+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/publication_tsv_notitle.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/publication_tsv_notitle.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/publication_tsv_notitle.xsl	(nonexistent)
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-    <!-- Turn off auto-insertion of <?xml> tag and set indenting on -->
-    <xsl:output method="text" encoding="utf-8" omit-xml-declaration="yes" media-type="text/csv" />
-
-    <!-- strip whitespace from whitespace-only nodes -->
-    <xsl:strip-space elements="*"/>
-
-    <xsl:template match = "/">
-<!--
-        <xsl:text disable-output-escaping="yes">Title&#x9;Authors&#x9;Publication Year&#x9;DOI&#x9;Permanent identifier&#x9;Publication type&#x9;Journal&#x9;Funder&#x9;Project Name (GA Number)&#x9;Access&#xD;</xsl:text>
--->
-        <xsl:apply-templates select="//result"/>
-    </xsl:template>
-
-    <!-- Title&#x9; Authors&#x9; Description&#x9; Year&#x9; DOI&#x9; Permanent identifier&#x9; Publication type&#x9; Journal&#x9; Project Name&#x9; GA number&#x9; Access -->
-    <xsl:template match="result">
-        <xsl:choose>
-            <xsl:when test="field[@name='project']">
-                <xsl:for-each select="field[@name='project']">
-                    <!-- title -->
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:value-of select="../field[@name='title']/@value"/>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>&#x9;</xsl:text>
-
-                    <!-- authors -->
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:for-each select="../field[@name='hasAuthor']">
-                        <xsl:sort select="./field[@name='ranking']/@value" data-type="number"/>
-                        <xsl:value-of select="field[@name='fullname']/@value"/>
-                        <xsl:if test="not(position()=last())">
-                            <xsl:text>;</xsl:text>
-                        </xsl:if>
-                    </xsl:for-each>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>&#x9;</xsl:text>
-
-                    <!-- description
-                    <xsl:text>&quot;</xsl:text>
-                        <xsl:value-of select="field[@name='description']/@value"/>
-                        <xsl:if test="position() != last()"><xsl:text>&#160;</xsl:text></xsl:if>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>&#x9;</xsl:text>
-            -->
-                    <!-- year -->
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:value-of select="../field[@name='dateofacceptance']/@value"/>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>&#x9;</xsl:text>
-
-                    <!-- DOI -->
-                    <xsl:for-each select="../field[@name='pid']">
-                        <xsl:if test="field[@name='classid' and @value='doi']/@value = 'doi'">
-                            <xsl:text>&quot;</xsl:text>
-                            <xsl:value-of select="field[@name='value']/@value"/>
-                            <xsl:text>&quot;</xsl:text>
-                        </xsl:if>
-                    </xsl:for-each>
-                    <xsl:text>&#x9;</xsl:text>
-
-                    <!-- Permanent Identifier -->
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:value-of select="../field[@name='datasource'][1]/field[@name='url']/@value"/>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>&#x9;</xsl:text>
-
-                    <!-- Publication type -->
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:value-of select="../field[@name='datasource'][1]/field[@name='typename']/@value"/>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>&#x9;</xsl:text>
-
-                    <!-- journal -->
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:for-each select="../field[@name='source']">
-                        <xsl:value-of select="replace(@value, '&lt;/?\w+[^&lt;]*&gt;', '')"/>
-                    </xsl:for-each>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>&#x9;</xsl:text>
-
-                    <!-- Funder -->
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:for-each select="field[@name='funding']/field[@name='funder']">
-                        <xsl:value-of select="@value"/>
-                    </xsl:for-each>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>&#x9;</xsl:text>
-
-                    <!-- project name -->
-                    <xsl:text>&quot;</xsl:text>
-                    <!-- project name -->
-                    <xsl:choose>
-                        <xsl:when test="field[@name='projectacronym']/@value != ''" >
-                            <xsl:value-of select="field[@name='projectacronym']/@value"/>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:value-of select="field[@name='projecttitle']/@value"/>
-                        </xsl:otherwise>
-                    </xsl:choose>
-                    <xsl:if test="field[@name='projectcode']/@value!= ''">
-                        <xsl:value-of select="concat('(',field[@name='projectcode']/@value,')')"/>
-                    </xsl:if>
-
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>&#x9;</xsl:text>
-
-                    <!--access -->
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:value-of select="../field[@name='bestaccessright']/@value"/>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>&#xD;</xsl:text>
-
-                </xsl:for-each>
-            </xsl:when>
-            <xsl:otherwise>
-                <!-- title -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:value-of select="field[@name='title']/@value"/>
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>&#x9;</xsl:text>
-
-                <!-- authors -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:for-each select="field[@name='hasAuthor']">
-                    <xsl:value-of select="field[@name='fullname']/@value"/>
-                    <xsl:if test="not(position()=last())">
-                        <xsl:text>;</xsl:text>
-                    </xsl:if>
-                </xsl:for-each>
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>&#x9;</xsl:text>
-
-                <!-- year -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:value-of select="field[@name='dateofacceptance']/@value"/>
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>&#x9;</xsl:text>
-
-                <!-- DOI -->
-                <xsl:for-each select="field[@name='pid']">
-                    <xsl:if test="field[@name='classid' and @value='doi']/@value = 'doi'">
-                        <xsl:text>&quot;</xsl:text>
-                        <xsl:value-of select="field[@name='value']/@value"/>
-                        <xsl:text>&quot;</xsl:text>
-                    </xsl:if>
-                </xsl:for-each>
-                <xsl:text>&#x9;</xsl:text>
-
-                <!-- Permanent Identifier -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:value-of select="field[@name='datasource'][1]/field[@name='url']/@value"/>
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>&#x9;</xsl:text>
-
-                <!-- Publication type -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:value-of select="field[@name='datasource'][1]/field[@name='typename']/@value"/>
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>&#x9;</xsl:text>
-
-                <!-- journal -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:for-each select="field[@name='source']">
-                    <xsl:value-of select="@value"/>
-                </xsl:for-each>
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>&#x9;</xsl:text>
-
-                <!-- Funder -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>&#x9;</xsl:text>
-
-                <!-- project name -->
-                <xsl:text>&quot;</xsl:text>
-                <!-- project name -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>&#x9;</xsl:text>
-
-                <!--access -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:value-of select="../field[@name='bestaccessright']/@value"/>
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>&#xD;</xsl:text>
-            </xsl:otherwise>
-        </xsl:choose>
-
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/organization.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/organization.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/organization.xsl	(nonexistent)
@@ -1,316 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:dri="http://www.driver-repository.eu/namespace/dri"
-                xmlns:oaf="http://namespace.openaire.eu/oaf"
-                xmlns:dc="http://purl.org/dc/elements/1.1/">
-    <xsl:output method="xml" indent="yes" encoding="UTF-8"/>
-
-    <xsl:template match = "/">
-        <result type ="result">
-            <xsl:apply-templates select="//header"/>
-            <xsl:apply-templates select="//oaf:organization"/>
-            <xsl:apply-templates select="//rel"/>
-        </result>
-    </xsl:template>
-
-    <!-- HEADER
-    fields in header:
-    1. dri:objIdentifier 		[objIdentifier]
-    2. dri:repositoryId			X
-    3. dri:dateOfCollection		X
-    -->
-    <xsl:template match = "header">
-        <field name="organizationId" multiplicity="false" indexId="objIdentifier" label="Object id">
-            <xsl:attribute name="value">
-                <xsl:value-of select='./dri:objIdentifier'/>
-            </xsl:attribute>
-        </field>
-        <!--<field name="repositoryId" multiplicity="false" indexId="???" label="???">
-            <xsl:attribute name="value">
-                <xsl:value-of select='./dri:repositoryId'/>
-            </xsl:attribute>
-        </field>-->
-        <!--<field name="dateOfCollection" multiplicity="false" indexId="???" label="???">
-            <xsl:attribute name="value">
-                <xsl:value-of select='./dri:dateOfCollection'/>
-            </xsl:attribute>
-        </field>-->
-    </xsl:template>
-
-    <xsl:template match = "oaf:organization">
-
-        <xsl:for-each select = "./legalshortname">
-            <field name="legalshortname" indexId = "organizationlegalshortname" multiplicity="true" label="Legal short name">
-                <xsl:attribute name="value">
-                    <xsl:value-of select='.'/>
-                </xsl:attribute>
-            </field>
-        </xsl:for-each>
-
-        <xsl:for-each select = "./legalname">
-            <field name="legalname" indexId = "organizationlegalname" multiplicity="true" label="Legal name">
-                <xsl:attribute name="value">
-                    <xsl:value-of select='.'/>
-                </xsl:attribute>
-            </field>
-        </xsl:for-each>
-
-        <xsl:for-each select = "./websiteurl">
-            <field name="websiteurl" indexId = "organizationwebsiteurl" multiplicity="true" label="Website url">
-                <xsl:attribute name="value">
-                    <xsl:value-of select='.'/>
-                </xsl:attribute>
-            </field>
-        </xsl:for-each>
-
-        <xsl:for-each select = "./country">
-            <field name="countryid" indexId = "organizationcountryid" multiplicity="true" label="Country">
-                <xsl:attribute name="value">
-                    <xsl:value-of select='./@classid'/>
-                </xsl:attribute>
-            </field>
-            <field name="countryname" indexId = "organizationcountryname" multiplicity="true" label="Country">
-                <xsl:attribute name="value">
-                    <xsl:value-of select='./@classname'/>
-                </xsl:attribute>
-            </field>
-        </xsl:for-each>
-
-
-        <!--
-
-            <xsl:for-each select = "./logourl">
-                <field name="logourl" indexId = "organizationlogourl" multiplicity="true" label="Logo url">
-                    <xsl:attribute name="value">
-                        <xsl:value-of select='.'/>
-                    </xsl:attribute>
-                </field>
-            </xsl:for-each>
-
-            <xsl:for-each select = "./eclegalbody">
-                <field name="eclegalbody" indexId = "organizationeclegalbody" multiplicity="true" label="Eclegal body">
-                    <xsl:attribute name="value">
-                        <xsl:value-of select='.'/>
-                    </xsl:attribute>
-                </field>
-            </xsl:for-each>
-
-            <xsl:for-each select = "./eclegalperson">
-                <field name="eclegalperson" indexId = "organizationeclegalperson" multiplicity="true" label="Eclegal person">
-                    <xsl:attribute name="value">
-                        <xsl:value-of select='.'/>
-                    </xsl:attribute>
-                </field>
-            </xsl:for-each>
-
-            <xsl:for-each select = "./ecnonprofit">
-                <field name="ecnonprofit" indexId = "organizationecnonprofit" multiplicity="true" label="EC non profit">
-                    <xsl:attribute name="value">
-                        <xsl:value-of select='.'/>
-                    </xsl:attribute>
-                </field>
-            </xsl:for-each>
-
-            <xsl:for-each select = "./ecresearchorganization">
-                <field name="ecresearchorganization" indexId = "organizationecresearchorganization" multiplicity="true" label="EC research organization">
-                    <xsl:attribute name="value">
-                        <xsl:value-of select='.'/>
-                    </xsl:attribute>
-                </field>
-            </xsl:for-each>
-
-            <xsl:for-each select = "./echighereducation">
-                <field name="echighereducation" indexId = "" multiplicity="true" label="EC higher education">
-                    <xsl:attribute name="value">
-                        <xsl:value-of select='.'/>
-                    </xsl:attribute>
-                </field>
-            </xsl:for-each>
-
-            <xsl:for-each select = "./ecinternationalorganizationeurinterests">
-                <field name="ecinternationalorganizationeurinterests" indexId = "organizationecinternationalorganizationeurinterests" multiplicity="true" label="EC international organization eur interests">
-                    <xsl:attribute name="value">
-                        <xsl:value-of select='.'/>
-                    </xsl:attribute>
-                </field>
-            </xsl:for-each>
-
-            <xsl:for-each select = "./ecinternationalorganization">
-                <field name="ecinternationalorganization" indexId = "organizationecinternationalorganization" multiplicity="true" label="EC international organization">
-                    <xsl:attribute name="value">
-                        <xsl:value-of select='.'/>
-                    </xsl:attribute>
-                </field>
-            </xsl:for-each>
-
-            <xsl:for-each select = "./ecenterprise">
-                <field name="ecenterprise" indexId = "organizationecenterprise" multiplicity="true" label="EC enterprice">
-                    <xsl:attribute name="value">
-                        <xsl:value-of select='.'/>
-                    </xsl:attribute>
-                </field>
-            </xsl:for-each>
-
-            <xsl:for-each select = "./ecsmevalidated">
-                <field name="ecsmevalidated" indexId = "organizationecsmevalidated" multiplicity="true" label="EC sme validated">
-                    <xsl:attribute name="value">
-                        <xsl:value-of select='.'/>
-                    </xsl:attribute>
-                </field>
-            </xsl:for-each>
-
-            <xsl:for-each select = "./ecnutscode">
-                <field name="ecnutscode" indexId = "organizationecnutscode" multiplicity="true" label="EC nuts code">
-                    <xsl:attribute name="value">
-                        <xsl:value-of select='.'/>
-                    </xsl:attribute>
-                </field>
-            </xsl:for-each>
-
-            <xsl:for-each select = "./collectedfrom">
-                <field name="collectedfrom" indexId = "organizationcollectedfrom" multiplicity="true" label="Collected from">
-                    <xsl:attribute name="value">
-                        <xsl:value-of select='.'/>
-                    </xsl:attribute>
-                </field>
-            </xsl:for-each>
-
-
-            <xsl:for-each select = "./pid">
-                <field name="pidid" indexId = "pidclassid" multiplicity="true" label="Pid">
-                    <xsl:attribute name="value">
-                        <xsl:value-of select='./@classid'/>
-                    </xsl:attribute>
-                </field>
-                <field name="pidname" indexId = "pidclassname" multiplicity="true" label="Pid">
-                    <xsl:attribute name="value">
-                        <xsl:value-of select='./@classname'/>
-                    </xsl:attribute>
-                </field>
-            </xsl:for-each>
-
-        -->
-    </xsl:template>
-
-    <xsl:template match="rel">
-        <!--PERSON-->
-        <xsl:if test="./to/@type='person'">
-            <field name="author" indexId = "objIdentifier"  multiplicity="true">
-                <xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-                <field name = "personId" indexId ="objIdentifier" multiplicity="false" label="Person id">
-                    <xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-                </field>
-                <field name = "role" indexId ="" multiplicity="false" label="role">
-                    <xsl:attribute name="value"><xsl:value-of select='./to/@class'/> </xsl:attribute>
-                </field>
-                <field name = "fullname" indexId ="personfullname" multiplicity="false" label="Person fullname">
-                    <xsl:attribute name="value"><xsl:value-of select='./fullname'/> </xsl:attribute>
-                </field>
-                <field name = "ranking" indexId ="" multiplicity="false" label="ranking">
-                    <xsl:attribute name="value"><xsl:value-of select='./ranking'/> </xsl:attribute>
-                </field>
-            </field>
-        </xsl:if>
-        <!--PROJECT-->
-        <xsl:if test="./to/@type='project'">
-            <field name="project" indexId = "objIdentifier" multiplicity="true">
-                <xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-                <field name = "projectId" indexId ="objIdentifier" multiplicity="false" label="Project id">
-                    <xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-                </field>
-                <field name = "role" indexId ="" multiplicity="false" label="role">
-                    <xsl:attribute name="value"><xsl:value-of select='./to/@class'/> </xsl:attribute>
-                </field>
-                <field name = "projectcode" indexId ="projectcode" multiplicity="false" label="Project(s)">
-                    <xsl:attribute name="value"><xsl:value-of select='./code'/> </xsl:attribute>
-                </field>
-                <field name = "projectacronym" indexId ="projectacronym" multiplicity="false" label="Project(s)">
-                    <xsl:attribute name="value"><xsl:value-of select='./acronym'/> </xsl:attribute>
-                </field>
-                <field name = "projecttitle" indexId ="projecttitle" multiplicity="false" label="Project title">
-                    <xsl:attribute name="value"><xsl:value-of select='./title'/> </xsl:attribute>
-                </field>
-                <field name = "projectcontracttypeid" indexId ="projectcontracttypeid" multiplicity="false" label="Project contract type id">
-                    <xsl:attribute name="value"><xsl:value-of select='./contracttype/@classid'/> </xsl:attribute>
-                </field>
-                <field name = "projectcontracttypename" indexId ="projectcontracttypename" multiplicity="false" label="Project contract type name">
-                    <xsl:attribute name="value"><xsl:value-of select='./contracttype/@classname'/> </xsl:attribute>
-                </field>
-                <xsl:for-each select = "./funding">
-                    <field name = "funding" indexId = "" multiplicity = "true">
-                        <field name ="funder" indexId ="relfunder" multiplicity ="false">
-                            <xsl:attribute name="value"><xsl:value-of select='./funder/@name'/></xsl:attribute>
-                        </field>
-                        <field name ="funderid" indexId ="relfunderid" multiplicity ="false">
-                            <xsl:attribute name="value"><xsl:value-of select='./funder/@id'/></xsl:attribute>
-                        </field>
-                        <field name ="fundershortname" indexId ="" multiplicity ="false">
-                            <xsl:attribute name="value"><xsl:value-of select='./funder/@shortname'/></xsl:attribute>
-                        </field>
-                    </field>
-                </xsl:for-each>
-            </field>
-        </xsl:if>
-        <!--RESULT-->
-        <xsl:if test="./to/@type='result'">
-            <field name="result" indexId = "objIdentifier"  multiplicity="true">
-                <xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-                <field name = "resultid" indexId ="objIdentifier" multiplicity="false" label="Result id">
-                    <xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-                </field>
-                <field name = "title" indexId = "resulttitle" multiplicity = "false" label = "Title">
-                    <xsl:attribute name="value">
-                        <xsl:value-of select="./title"/>
-                    </xsl:attribute>
-                </field>
-                <field name = "dateofacceptance" indexId = "resultdateofacceptance" multiplicity = "false" label = "Date of acceptance">
-                    <xsl:attribute name="value">
-                        <xsl:value-of select="./dateofacceptance"/>
-                    </xsl:attribute>
-                </field>
-                <field name = "resulttypeid" indexId = "resulttypeid" multiplicity = "false" label = "type id">
-                    <xsl:attribute name="value">
-                        <xsl:value-of select="./resulttype/@classid"/>
-                    </xsl:attribute>
-                </field>
-                <field name = "resulttypename" indexId = "resulttypename" multiplicity = "false" label = "type name">
-                    <xsl:attribute name="value">
-                        <xsl:value-of select="./resulttype/@classname"/>
-                    </xsl:attribute>
-                </field>
-            </field>
-        </xsl:if>
-        <!--ORGANIZATION-->
-        <xsl:if test="./to/@type='organization'">
-            <field name="organization" indexId = "objIdentifier"  multiplicity="true">
-                <xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-                <field name = "organizationid" indexId ="objIdentifier" multiplicity="false" label="Organization id">
-                    <xsl:attribute name="value"><xsl:value-of select='./to'/> </xsl:attribute>
-                </field>
-                <field name = "role" indexId ="" multiplicity="false" label="role">
-                    <xsl:attribute name="value"><xsl:value-of select='./to/@class'/> </xsl:attribute>
-                </field>
-                <field name = "legalshortname" indexId ="organizationlegalshortname" multiplicity="false" label="Organization short name">
-                    <xsl:attribute name="value"><xsl:value-of select='./legalshortname'/> </xsl:attribute>
-                </field>
-                <field name = "websiteurl" indexId ="organizationwebsiteurl" multiplicity="false" label="Website">
-                    <xsl:attribute name="value"><xsl:value-of select='./websiteurl'/> </xsl:attribute>
-                </field>
-                <field name = "countryid" indexId ="organizationcountryid" multiplicity="false" label="Country code">
-                    <xsl:attribute name="value"><xsl:value-of select='./country/@classid'/> </xsl:attribute>
-                </field>
-                <field name = "countryname" indexId ="organizationcountryname" multiplicity="false" label="Country">
-                    <xsl:attribute name="value"><xsl:value-of select='./country/@classname'/> </xsl:attribute>
-                </field>
-                <field name = "participantnumber" indexId ="" multiplicity="false" label="Participant Number">
-                    <xsl:attribute name="value"><xsl:value-of select='./participantnumber'/> </xsl:attribute>
-                </field>
-                <field name = "contactperson" indexId ="" multiplicity="false" label="Contact Person">
-                    <xsl:attribute name="value"><xsl:value-of select='./contactperson'/> </xsl:attribute>
-                </field>
-            </field>
-        </xsl:if>
-
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/rss.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/rss.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/rss.xsl	(nonexistent)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/">
-    <xsl:output method="xml" indent="yes" encoding="UTF-8"/>
-
-    <xsl:template match = "/">
-        <rss version="2.0">
-            <channel>
-                <xsl:apply-templates select="response/header"/>
-                <xsl:apply-templates select="//result"/>
-            </channel>
-        </rss>
-    </xsl:template>
-
-    <xsl:template match="response/header">
-        <title>OpenAIRE search results</title>
-        <link>www.openaire.eu</link>
-        <description><xsl:value-of select="concat('Results for query: ', query)"/></description>
-        <language><xsl:value-of select="locale"/></language>
-        <pubDate><xsl:value-of  select="current-dateTime()"/></pubDate>
-        <lastBuildDate><xsl:value-of  select="current-dateTime()"/></lastBuildDate>
-        <generator>OpenAIRE RSS Generator</generator>
-
-        <opensearch:totalResults><xsl:value-of select="total"/></opensearch:totalResults>
-        <opensearch:startIndex><xsl:value-of select="page"/></opensearch:startIndex>
-        <opensearch:itemsPerPage><xsl:value-of select="size"/></opensearch:itemsPerPage>
-    </xsl:template>
-
-    <xsl:template match="result">
-        <item>
-            <title><xsl:value-of select="field[@name='title']/@value"/></title>
-            <description><xsl:value-of select="field[@name='description']/@value"/></description>
-            <xsl:for-each select="field[@name='hasAuthor']">
-                <author><xsl:value-of select="field[@name='fullname']/@value"/></author>
-            </xsl:for-each>
-            <xsl:for-each select="field[@name='datasource']">
-                <xsl:for-each select="field[@name='url']">
-                    <link><xsl:value-of select="@value"/></link>
-                </xsl:for-each>
-            </xsl:for-each>
-            <pubDate><xsl:value-of select="field[@name='dateofacceptance']/@value"/></pubDate>
-        </item>
-    </xsl:template>
-
-</xsl:stylesheet>
-
-
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/sc39.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/sc39.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/sc39.xml	(nonexistent)
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value=""/>
-        <RESOURCE_TYPE value="VocabularyDSResourceType"/>
-        <RESOURCE_KIND value="VocabularyDSResources"/>
-        <RESOURCE_URI value="String"/>
-        <DATE_OF_CREATION value="2008-06-25T14:50:49+02:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <VOCABULARY_NAME>sc 39</VOCABULARY_NAME>
-            <VOCABULARY_DESCRIPTION>OpenAIRE sc39 description</VOCABULARY_DESCRIPTION>
-            <TERMS>
-                <TERM code="true" english_name="with sc39" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-                <TERM code="false" english_name="without sc39" native_name="">
-                    <SYNONYMS/>
-                </TERM>
-            </TERMS>
-        </CONFIGURATION>
-        <STATUS>
-            <LAST_UPDATE value="2008-06-25T14:50:49+02:00"/>
-        </STATUS>
-        <SECURITY_PARAMETERS>String</SECURITY_PARAMETERS>
-    </BODY>
-</RESOURCE_PROFILE>
-
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/tsv.xsl
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/tsv.xsl	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/tsv.xsl	(nonexistent)
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-    <!-- Turn off auto-insertion of <?xml> tag and set indenting on -->
-    <xsl:output method="text" encoding="utf-8" omit-xml-declaration="yes" media-type="text/csv" />
-
-    <!-- strip whitespace from whitespace-only nodes -->
-    <xsl:strip-space elements="*"/>
-
-    <xsl:template match = "/">
-        <xsl:text disable-output-escaping="yes">Title&#x9;Authors&#x9;Publication Year&#x9;DOI&#x9;Download From&#x9;Publication type&#x9;Journal&#x9;Funder&#x9;Project Name (GA Number)&#x9;Access&#xD;</xsl:text>
-        <xsl:apply-templates select="//result"/>
-    </xsl:template>
-
-    <!-- Title&#x9; Authors&#x9; Description&#x9; Year&#x9; DOI&#x9; Permanent identifier&#x9; Download From&#x9; Journal&#x9; Project Name&#x9; GA number&#x9; Access -->
-    <xsl:template match="result">
-        <xsl:choose>
-            <xsl:when test="field[@name='project']">
-                <xsl:for-each select="field[@name='project']">
-                    <!-- title -->
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:value-of select="../field[@name='title']/@value"/>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>&#x9;</xsl:text>
-
-                    <!-- authors -->
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:for-each select="../field[@name='hasAuthor']">
-                        <xsl:sort select="field[@name='ranking']/@value" data-type="number"/>
-                        <xsl:value-of select="field[@name='fullname']/@value"/>
-                        <xsl:if test="not(position()=last())">
-                            <xsl:text>;</xsl:text>
-                        </xsl:if>
-                    </xsl:for-each>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>&#x9;</xsl:text>
-
-                    <!-- description
-                    <xsl:text>&quot;</xsl:text>
-                        <xsl:value-of select="field[@name='description']/@value"/>
-                        <xsl:if test="position() != last()"><xsl:text>&#160;</xsl:text></xsl:if>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>&#x9;</xsl:text>
-            -->
-                    <!-- year -->
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:value-of select="../field[@name='dateofacceptance']/@value"/>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>&#x9;</xsl:text>
-
-                    <!-- DOI -->
-                    <xsl:for-each select="../field[@name='pid']">
-                        <xsl:if test="field[@name='classid' and @value='doi']/@value = 'doi'">
-                            <xsl:text>&quot;</xsl:text>
-                            <xsl:value-of select="field[@name='value']/@value"/>
-                            <xsl:text>&quot;</xsl:text>
-                        </xsl:if>
-                    </xsl:for-each>
-                    <xsl:text>&#x9;</xsl:text>
-
-                    <!-- Permanent Identifier -->
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:value-of select="../field[@name='datasource'][1]/field[@name='url']/@value"/>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>&#x9;</xsl:text>
-
-                    <!-- Publication type -->
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:value-of select="../field[@name='datasource'][1]/field[@name='typename']/@value"/>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>&#x9;</xsl:text>
-
-                    <!-- journal -->
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:for-each select="../field[@name='source']">
-                        <xsl:value-of select="replace(@value, '&lt;/?\w+[^&lt;]*&gt;', '')"/>
-                    </xsl:for-each>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>&#x9;</xsl:text>
-
-                    <!-- Funder -->
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:for-each select="field[@name='funding']/field[@name='funder']">
-                        <xsl:value-of select="@value"/>
-                    </xsl:for-each>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>&#x9;</xsl:text>
-
-                    <!-- project name -->
-                    <xsl:text>&quot;</xsl:text>
-                    <!-- project name -->
-                    <xsl:choose>
-                        <xsl:when test="field[@name='projectacronym']/@value != ''" >
-                            <xsl:value-of select="field[@name='projectacronym']/@value"/>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:value-of select="field[@name='projecttitle']/@value"/>
-                        </xsl:otherwise>
-                    </xsl:choose>
-                    <xsl:if test="field[@name='projectcode']/@value!= ''">
-                        <xsl:value-of select="concat('(',field[@name='projectcode']/@value,')')"/>
-                    </xsl:if>
-
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>&#x9;</xsl:text>
-
-                    <!--access -->
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:value-of select="../field[@name='bestaccessright']/@value"/>
-                    <xsl:text>&quot;</xsl:text>
-                    <xsl:text>&#xD;</xsl:text>
-
-                </xsl:for-each>
-            </xsl:when>
-            <xsl:otherwise>
-                <!-- title -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:value-of select="field[@name='title']/@value"/>
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>&#x9;</xsl:text>
-
-                <!-- authors -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:for-each select="field[@name='hasAuthor']">
-                    <xsl:value-of select="field[@name='fullname']/@value"/>
-                    <xsl:if test="not(position()=last())">
-                        <xsl:text>;</xsl:text>
-                    </xsl:if>
-                </xsl:for-each>
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>&#x9;</xsl:text>
-
-                <!-- year -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:value-of select="field[@name='dateofacceptance']/@value"/>
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>&#x9;</xsl:text>
-
-                <!-- DOI -->
-                <xsl:for-each select="field[@name='pid']">
-                    <xsl:if test="field[@name='classid' and @value='doi']/@value = 'doi'">
-                        <xsl:text>&quot;</xsl:text>
-                        <xsl:value-of select="field[@name='value']/@value"/>
-                        <xsl:text>&quot;</xsl:text>
-                    </xsl:if>
-                </xsl:for-each>
-                <xsl:text>&#x9;</xsl:text>
-
-                <!-- Download From -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:value-of select="field[@name='datasource'][1]/field[@name='url']/@value"/>
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>&#x9;</xsl:text>
-
-                <!-- Publication type -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:value-of select="field[@name='datasource'][1]/field[@name='typename']/@value"/>
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>&#x9;</xsl:text>
-
-                <!-- journal -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:for-each select="field[@name='source']">
-                    <xsl:value-of select="@value"/>
-                </xsl:for-each>
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>&#x9;</xsl:text>
-
-                <!-- Funder -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>&#x9;</xsl:text>
-
-                <!-- project name -->
-                <xsl:text>&quot;</xsl:text>
-                <!-- project name -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>&#x9;</xsl:text>
-
-                <!--access -->
-                <xsl:text>&quot;</xsl:text>
-                <xsl:value-of select="../field[@name='bestaccessright']/@value"/>
-                <xsl:text>&quot;</xsl:text>
-                <xsl:text>&#xD;</xsl:text>
-            </xsl:otherwise>
-        </xsl:choose>
-
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/uoa-search.properties
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/uoa-search.properties	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/resources/uoa-search.properties	(nonexistent)
@@ -1,4 +0,0 @@
-#Generated by ANT
-name=uoa-search
-version=0.0.3
-label=
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/micrometer/MicrometerComponent.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/micrometer/MicrometerComponent.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/micrometer/MicrometerComponent.java	(nonexistent)
@@ -1,76 +0,0 @@
-package eu.dnetlib.data.search.micrometer;
-
-import io.micrometer.core.aop.TimedAspect;
-import io.micrometer.core.instrument.Clock;
-import io.micrometer.core.instrument.MeterRegistry;
-import io.micrometer.core.instrument.Tag;
-import io.micrometer.core.instrument.Tags;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
-import io.micrometer.spring.web.servlet.WebMvcTags;
-import io.micrometer.spring.web.servlet.WebMvcTagsProvider;
-import io.prometheus.client.CollectorRegistry;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-
-@ComponentScan
-@Configuration
-@Component
-@EnableWebMvc
-public class MicrometerComponent {
-
-    @Bean
-    public Clock micrometerClock() {
-        return Clock.SYSTEM;
-    }
-
-    @Bean
-    public PrometheusConfig prometheusConfig() {
-        return PrometheusConfig.DEFAULT;
-    }
-
-    @Bean
-    public PrometheusMeterRegistry prometheusMeterRegistry(PrometheusConfig config, CollectorRegistry collectorRegistry,
-                                                           Clock clock) {
-        return new PrometheusMeterRegistry(config, collectorRegistry, clock);
-    }
-
-    @Bean
-    public CollectorRegistry collectorRegistry() {
-        return new CollectorRegistry(true);
-    }
-
-    @Bean
-    public TimedAspect timedAspect(MeterRegistry registry) {
-        return new TimedAspect(registry);
-    }
-
-    @Bean
-    public WebMvcTagsProvider webMvcTagsProvider() {
-        return new WebMvcTagsProvider() {
-            @Override
-            public Iterable<Tag> httpLongRequestTags(HttpServletRequest httpServletRequest, Object o) {
-                return new ArrayList<>();
-            }
-
-            @Override
-            public Iterable<Tag> httpRequestTags(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, Throwable throwable) {
-                Tag uriTag = Tag.of("status", String.valueOf(httpServletResponse.getStatus()));
-                return Tags.of(WebMvcTags.method(httpServletRequest), uriTag, WebMvcTags.exception(throwable), WebMvcTags.status(httpServletResponse));
-            }
-        };
-    }
-
-   /*@Bean
-    public MappedInterceptor myInterceptor(PrometheusMeterRegistry prometheusMeterRegistry) {
-        return new MappedInterceptor(null, new PrometheusRequestTimerInterceptor(prometheusMeterRegistry));
-    }*/
-
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/micrometer/InterceptorConfig.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/micrometer/InterceptorConfig.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/micrometer/InterceptorConfig.java	(nonexistent)
@@ -1,18 +0,0 @@
-package eu.dnetlib.data.search.micrometer;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-
-@Configuration
-public class InterceptorConfig extends WebMvcConfigurerAdapter {
-
-    /*
-    @Autowired
-
-    private PrometheusRequestTimerInterceptor prometheusRequestTimerInterceptor;
-
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(prometheusRequestTimerInterceptor);
-    }*/
-}
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/micrometer/PrometheusRequestTimerInterceptor.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/micrometer/PrometheusRequestTimerInterceptor.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/micrometer/PrometheusRequestTimerInterceptor.java	(nonexistent)
@@ -1,41 +0,0 @@
-package eu.dnetlib.data.search.micrometer;
-
-import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
-
-@Component
-public class PrometheusRequestTimerInterceptor extends HandlerInterceptorAdapter{
-
-    /*private PrometheusMeterRegistry prometheusRegistry;
-    private DistributionSummary summary;
-
-    PrometheusRequestTimerInterceptor(){}
-
-    PrometheusRequestTimerInterceptor(PrometheusMeterRegistry prometheusMeterRegistry) {
-        this.prometheusRegistry = prometheusMeterRegistry;
-
-        summary = DistributionSummary.builder("search.server.response.size")
-                .publishPercentileHistogram()
-                .sla(1000000, 2500000, 3500000)
-                .minimumExpectedValue((long) 1000000)
-                .maximumExpectedValue((long) 3500000)
-                .scale(500000)
-                .register(prometheusRegistry);
-    }
-
-    @Override
-    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex)
-            throws Exception {
-        summary.record((double)response.getBufferSize());
-
-    }
-
-    @Override
-    public void postHandle(
-            HttpServletRequest request,
-            HttpServletResponse response,
-            Object handler,
-            ModelAndView modelAndView) throws Exception {
-
-    }*/
-}
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/micrometer/Metrics.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/micrometer/Metrics.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/micrometer/Metrics.java	(nonexistent)
@@ -1,88 +0,0 @@
-package eu.dnetlib.data.search.micrometer;
-
-import io.micrometer.core.instrument.Tags;
-import io.micrometer.core.instrument.Timer;
-import io.micrometer.core.instrument.binder.jvm.JvmGcMetrics;
-import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
-import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
-import org.apache.log4j.Logger;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import javax.ws.rs.core.Application;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.time.Duration;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-
-@Configuration
-@Component
-public class Metrics {
-
-    private static final Logger logger = Logger.getLogger(Metrics.class);
-
-    private static final AtomicInteger n = new AtomicInteger(1);
-
-    @Autowired
-    private PrometheusMeterRegistry registry;
-
-    @PostConstruct
-    public void init() {
-
-        new JvmMemoryMetrics().bindTo(registry);
-        new JvmGcMetrics().bindTo(registry);
-        new JvmThreadMetrics().bindTo(registry);
-
-        Timer.builder("search.server.response.duration").description("search response time with solr request and transformation included")
-                .sla(Duration.ofMillis(100), Duration.ofMillis(500), Duration.ofMillis(1000), Duration.ofMillis(2000), Duration.ofMillis(2500),
-                        Duration.ofMillis(3000),Duration.ofMillis(4000), Duration.ofMillis(5000)).register(registry);
-
-        Timer.builder("solr.server.response.duration").description("solr response time")
-                .sla(Duration.ofMillis(100), Duration.ofMillis(500), Duration.ofMillis(1000), Duration.ofMillis(2000), Duration.ofMillis(2500),
-                        Duration.ofMillis(3000),Duration.ofMillis(4000), Duration.ofMillis(5000)).register(registry);
-
-        MavenXpp3Reader reader = new MavenXpp3Reader();
-        Model model = null;
-
-        try {
-                model = reader.read(
-                        new InputStreamReader(
-                                Application.class.getResourceAsStream(
-                                        "/META-INF/maven/eu.dnetlib/uoa-search/pom.xml"
-                                )
-                        )
-                );
-
-        } catch (XmlPullParserException e) {
-           logger.error("Error reading pom. ", e);
-
-        } catch (IOException e) {
-            logger.error("Error reading pom. ", e);
-        } {
-
-        }
-
-        List<Dependency> list = model.getDependencies();
-        Dependency micrometer = list.stream()
-                .filter(dependency -> dependency.getArtifactId().equals("micrometer-registry-prometheus"))
-                .findFirst()
-                .get();
-
-        registry.gauge("micrometer_info", Tags.of("component", model.getArtifactId()).and("scmtag", "HEAD").and("version", model.getVersion()), n);
-
-        //registry.summary("search.server.response.size");
-
-
-
-
-    }
-}
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/CustomHttpServletRequest.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/CustomHttpServletRequest.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/CustomHttpServletRequest.java	(nonexistent)
@@ -1,55 +0,0 @@
-package eu.dnetlib.data.search;
-
-import org.apache.log4j.Logger;
-import org.springframework.http.MediaType;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-
-public class CustomHttpServletRequest extends HttpServletRequestWrapper {
-
-    private Logger logger = Logger.getLogger(CustomHttpServletRequest.class);
-
-    public CustomHttpServletRequest(HttpServletRequest request) {
-        super(request);
-    }
-
-    @Override
-    public String getHeader(String name) throws IllegalArgumentException {
-        String format = super.getRequest().getParameter("format");
-
-        if (name.equals("Accept")) {
-            //make accept "equal to" format
-            if (format != null && super.getHeader(name) == null) {
-                if (format.toLowerCase().equals("xml")) {
-                    return MediaType.APPLICATION_XML_VALUE;
-                }
-
-                if (format.toLowerCase().equals("json")) {
-                    return MediaType.APPLICATION_JSON_VALUE;
-                }
-            }
-
-            //Ignore accept because so far it was ignored
-            //make accept "equal to" format
-            if (format!= null && super.getHeader(name)!=null){
-
-                if (format.toLowerCase().equals("xml")) {
-                    return MediaType.APPLICATION_XML_VALUE;
-                }
-
-                if (format.toLowerCase().equals("json")) {
-                    return MediaType.APPLICATION_JSON_VALUE;
-                }
-            }
-
-            //if no format is passed default format
-            if (format == null && super.getHeader(name) == null){
-                    return MediaType.APPLICATION_XML_VALUE;
-            }
-            
-        }
-        
-        return super.getHeader(name);
-    }
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/TransformerRegistry.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/TransformerRegistry.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/TransformerRegistry.java	(nonexistent)
@@ -1,19 +0,0 @@
-package eu.dnetlib.data.search.transform;
-
-import java.util.Locale;
-
-/**
- * 
- * @author kiatrop
- *
- */
-
-public interface TransformerRegistry {
-	
-	/**
-	 * Returns the {@link Transformer} with the given name.
-	 * @param name The name of the {@link Transformer}.
-	 * @return {@link Transformer}
-	 */
-	Transformer getTransformer(String name, Locale locale);
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/FormatterRegistry.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/FormatterRegistry.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/FormatterRegistry.java	(nonexistent)
@@ -1,18 +0,0 @@
-package eu.dnetlib.data.search.transform;
-
-import eu.dnetlib.data.search.transform.formatter.Formatter;
-
-/**
- * 
- * @author kiatrop
- *
- */
-public interface FormatterRegistry {
-
-	/**
-	 * Returns the formatter of a given name
-	 * @param name The name of the formatter
-	 * @return The formatter
-	 */
-	Formatter getFormatter(String name);
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/XsltTransformer.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/XsltTransformer.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/XsltTransformer.java	(nonexistent)
@@ -1,52 +0,0 @@
-package eu.dnetlib.data.search.transform;
-
-import org.apache.log4j.Logger;
-
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-import java.io.StringReader;
-import java.io.StringWriter;
-
-public class XsltTransformer implements Transformer {
-	
-	private final String xslt;
-	
-	private final Logger logger = Logger.getLogger(XsltTransformer.class);
-	private javax.xml.transform.Transformer xmlTransformer = null;
-	private StringWriter xmlResultResource = new StringWriter();
-	
-	public XsltTransformer(String xslt) throws TransformerConfigurationException, TransformerFactoryConfigurationError {
-		this.xslt = xslt;	
-		
-		//logger.debug(xslt);
-		synchronized(this) {
-			xmlTransformer = TransformerFactory.newInstance().newTemplates(new StreamSource(new StringReader(xslt))).newTransformer();
-            xmlTransformer.setOutputProperty("encoding", "UTF-8");
-		}
-	}
-	
-	@Override
-	public synchronized String transform(String input) throws TransformerException {
-		//logger.debug("Transforming input: " + input);
-		//logger.debug("xsl >>>>" + xslt);
-		xmlResultResource.getBuffer().setLength(0);
-
-		try {
-			xmlTransformer.transform(new StreamSource(new StringReader(input)), new StreamResult(xmlResultResource));
-
-		} catch (javax.xml.transform.TransformerException e) {
-			logger.warn("Error transforming xml: " + input, e);
-			throw new TransformerException("Error transforming xml: " + input, e);
-		}
-
-		return xmlResultResource.getBuffer().toString();
-	}
-
-	public String getXslt() {
-		return xslt;
-	}
-	
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/utils/VelocityUtil.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/utils/VelocityUtil.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/utils/VelocityUtil.java	(nonexistent)
@@ -1,34 +0,0 @@
-package eu.dnetlib.data.search.transform.utils;
-
-import org.apache.log4j.Logger;
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
-
-/**
- * Created by antleb on 12/12/13.
- */
-public class VelocityUtil {
-    private static VelocityEngine ve = null;
-
-    private static Logger logger = Logger.getLogger(VelocityUtil.class);
-
-    public synchronized static VelocityEngine getEngine() {
-        if (ve == null) {
-            try {
-                ve = new VelocityEngine();
-                ve.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath");
-                ve.setProperty("classpath.resource.loader.class", ClasspathResourceLoader.class.getName());
-                ve.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS, "org.apache.velocity.runtime.log.Log4JLogChute");
-                ve.setProperty("runtime.log.logsystem.log4j.logger", "root");
-
-                ve.init();
-            } catch (Exception e) {
-                logger.error("Error initializing velocity", e);
-                ve = null;
-            }
-        }
-
-        return ve;
-    }
-}
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/TransformerException.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/TransformerException.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/TransformerException.java	(nonexistent)
@@ -1,21 +0,0 @@
-package eu.dnetlib.data.search.transform;
-
-@SuppressWarnings("serial")
-public class TransformerException extends Exception {
-
-	public TransformerException() {
-		super();
-	}
-
-	public TransformerException(String message, Throwable cause) {
-		super(message, cause);
-	}
-
-	public TransformerException(String message) {
-		super(message);
-	}
-
-	public TransformerException(Throwable cause) {
-		super(cause);
-	}
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/FormatterException.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/FormatterException.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/FormatterException.java	(nonexistent)
@@ -1,20 +0,0 @@
-package eu.dnetlib.data.search.transform;
-
-@SuppressWarnings("serial")
-public class FormatterException extends Exception {
-	public FormatterException() {
-		super();
-	}
-
-	public FormatterException(String message, Throwable cause) {
-		super(message, cause);
-	}
-
-	public FormatterException(String message) {
-		super(message);
-	}
-
-	public FormatterException(Throwable cause) {
-		super(cause);
-	}
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/Transformer.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/Transformer.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/Transformer.java	(nonexistent)
@@ -1,12 +0,0 @@
-package eu.dnetlib.data.search.transform;
-
-public interface Transformer {
-
-	/**
-	 * Apply transformation in the input string.
-	 * 
-	 * @param input The string to be transformed
-	 * @return The string after the transformation 
-	 */
-	String transform(String input) throws TransformerException;
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/formatter/FormatterFactory.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/formatter/FormatterFactory.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/formatter/FormatterFactory.java	(nonexistent)
@@ -1,5 +0,0 @@
-package eu.dnetlib.data.search.transform.formatter;
-
-public interface FormatterFactory {
-	Formatter getFormatter(String formatterName);
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/formatter/SimpleFormatter.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/formatter/SimpleFormatter.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/formatter/SimpleFormatter.java	(nonexistent)
@@ -1,160 +0,0 @@
-package eu.dnetlib.data.search.transform.formatter;
-
-import eu.dnetlib.data.search.transform.FormatterException;
-import eu.dnetlib.data.search.transform.utils.VelocityUtil;
-import eu.dnetlib.domain.data.SearchResult;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.log4j.Logger;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.VelocityEngine;
-
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class SimpleFormatter implements Formatter {
-
-	private javax.xml.transform.Transformer xmlTransformer = null;
-	private StringWriter xmlResultResource = new StringWriter();
-
-	private Template t = null;
-	
-	private final Logger logger = Logger.getLogger(SimpleFormatter.class);
-	
-	public SimpleFormatter() throws FormatterException{
-        StringWriter writer = null;
-        InputStream inputStream = null;
-
-        try	{
-            VelocityEngine ve = VelocityUtil.getEngine();
-            String clean_xsl = "/eu/dnetlib/data/search/transform/config/omit-xml-declaration.xsl";
-
-			t = ve.getTemplate("/eu/dnetlib/data/search/transform/config/format.vm", "UTF-8");
-            inputStream = this.getClass().getResource(clean_xsl).openStream();
-			writer = new StringWriter();
-
-			IOUtils.copy(inputStream, writer);		
-
-            String xsl = writer.toString();
-			synchronized(this) {
-				xmlTransformer = TransformerFactory.newInstance().newTemplates(new StreamSource(new StringReader(xsl))).newTransformer();
-                xmlTransformer.setOutputProperty("encoding", "UTF-8");
-			}
-		} catch (Exception e) {
-			logger.error("Error while creating a velocity template.", e);
-			throw new FormatterException("Error while creating a velocity template.", e);
-		} finally {
-            IOUtils.closeQuietly(writer);
-            IOUtils.closeQuietly(inputStream);
-        }
-	}
-
-    public SimpleFormatter(String template) throws FormatterException {
-        StringWriter writer = null;
-        InputStream inputStream = null;
-
-        logger.debug("Creating formatter with template " + template);
-
-        try	{
-            VelocityEngine ve = VelocityUtil.getEngine();
-            String clean_xsl = "/eu/dnetlib/data/search/transform/config/omit-xml-declaration.xsl";
-            t = ve.getTemplate("/eu/dnetlib/data/search/transform/config/" + template, "UTF-8");
-
-            inputStream = this.getClass().getResource(clean_xsl).openStream();
-            writer = new StringWriter();
-
-            IOUtils.copy(inputStream, writer);
-
-            String xsl = writer.toString();
-            synchronized(this) {
-                xmlTransformer = TransformerFactory.newInstance().newTemplates(new StreamSource(new StringReader(xsl))).newTransformer();
-            }
-        } catch (Exception e) {
-            logger.error("Error while creating a velocity template.", e);
-            throw new FormatterException("Error while creating a velocity template.", e);
-
-        } finally {
-            IOUtils.closeQuietly(writer);
-            IOUtils.closeQuietly(inputStream);
-        }
-    }
-
-	@Override
-	public String format(SearchResult result) throws FormatterException {
-		VelocityContext context = null;
-		try {
-			context = new VelocityContext();
-		} catch (Exception e) {
-			logger.error("Error while creating a Velocity context.", e);
-			FormatterException fe = new FormatterException("Error while creating a Velocity context.", e);
-			throw fe;
-		}
-		try {
-			context.put("page", result.getPage());
-			context.put("query", StringEscapeUtils.escapeXml(result.getQuery()));
-			context.put("size", result.getSize());
-			context.put("total", result.getTotal());
-			context.put("locale", result.getLocale());
-			context.put("fields", result.getFields());
-
-            SimpleDateFormat sdf = new SimpleDateFormat("EEE, d MMM yy HH:mm:ss z");
-            context.put("currentDate", sdf.format(new Date()));
-
-			if(result.getSearchResults() == null) {
-				context.put("results", null);
-			} else {
-				//logger.info("After: " + clearDeclarations(result.getSearchResults()));
-                context.put("results", clearDeclarations(result.getSearchResults()));
-            }
-
-			if (result.getBrowseResults() == null) {
-				context.put("bresults", null);
-			} else {
-				context.put("bresults", clearDeclarations(result.getBrowseResults()));
-			}
-			
-			StringWriter writer = new StringWriter();
-			t.merge(context, writer);
-
-			return writer.toString();
-		
-		} catch (Exception e) {
-			String text = "Error while formatting.";
-			if (result == null) {
-				text += " And result is null.";
-			}
-			logger.error(text, e);
-			FormatterException fe = new FormatterException("Error while formatting.", e);
-			throw fe;
-		}
-	}
-	
-	public List<String> clearDeclarations(List<String> results) throws FormatterException{
-		List<String> cleared = new ArrayList<String>();
-		for(String result: results){
-			xmlResultResource.getBuffer().setLength(0);		
-			try {
-				xmlTransformer.transform(new StreamSource(new StringReader(result)), new StreamResult(xmlResultResource));
-				
-			} catch (TransformerException te) {
-				logger.warn("Error transforming xml: " + result, te);
-				throw new FormatterException("Error transforming xml: " + result, te);
-			}
-			
-			cleared.add(xmlResultResource.getBuffer().toString());
-		}
-		
-		return cleared;
-	}
-	
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/formatter/XSLTFormatter.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/formatter/XSLTFormatter.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/formatter/XSLTFormatter.java	(nonexistent)
@@ -1,68 +0,0 @@
-package eu.dnetlib.data.search.transform.formatter;
-
-import eu.dnetlib.data.search.transform.FormatterException;
-import eu.dnetlib.domain.data.SearchResult;
-import org.apache.log4j.Logger;
-
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-import java.io.StringReader;
-import java.io.StringWriter;
-
-public class XSLTFormatter extends SimpleFormatter implements Formatter {
-
-    private final String xslt;
-
-    private final Logger logger = Logger.getLogger(XSLTFormatter.class);
-
-    private javax.xml.transform.Transformer xmlTransformer = null;
-
-    public XSLTFormatter(String xslt) throws FormatterException {
-        super();
-        this.xslt = xslt;
-        try {
-            synchronized(this){
-                xmlTransformer = TransformerFactory.newInstance().newTemplates(new StreamSource(new StringReader(xslt))).newTransformer();
-                xmlTransformer.setOutputProperty("encoding", "UTF-8");
-            }
-        } catch (TransformerException te) {
-            logger.warn("Error creating "  + xslt + " transformer.", te);
-        }
-    }
-
-    public XSLTFormatter(String xslt, String template) throws FormatterException {
-        super(template);
-        this.xslt = xslt;
-        try {
-            synchronized(this){
-                xmlTransformer = TransformerFactory.newInstance().newTemplates(new StreamSource(new StringReader(xslt))).newTransformer();
-                xmlTransformer.setOutputProperty("encoding", "UTF-8");
-            }
-        } catch (TransformerException te) {
-            logger.warn("Error creating "  + xslt + " transformer.", te);
-        }
-    }
-
-    public synchronized String format(SearchResult result)  throws FormatterException {
-        String input = super.format(result);
-        StringWriter xmlResultResource = new StringWriter();
-
-        try {
-            xmlTransformer.transform(new StreamSource(new StringReader(input)), new StreamResult(xmlResultResource));
-
-        } catch (TransformerException te) {
-            logger.warn("Error transforming xml: " + input, te);
-            throw new FormatterException("Error transforming xml: " + input, te);
-        }
-
-        //logger.debug("Transformer returns " + xmlResultResource.toString());
-        return xmlResultResource.toString();
-    }
-
-    public String getXslt() {
-        return xslt;
-    }
-
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/formatter/BibtexEntry.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/formatter/BibtexEntry.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/formatter/BibtexEntry.java	(nonexistent)
@@ -1,37 +0,0 @@
-package eu.dnetlib.data.search.transform.formatter;
-
-import java.util.Map;
-
-public class BibtexEntry {
-
-	private String bibtexName = null;
-	private String xmlName = null;
-	private Map<String,String> fields = null;
-	
-
-	public String getBibtexName() {
-		return bibtexName;
-	}
-
-	public void setBibtexName(String bibtexName) {
-		this.bibtexName = bibtexName;
-	}
-
-	public String getXmlName() {
-		return xmlName;
-	}
-
-	public void setXmlName(String xmlName) {
-		this.xmlName = xmlName;
-	}
-
-	public Map<String, String> getFields() {
-		return fields;
-	}
-
-	public void setFields(Map<String, String> fields) {
-		this.fields = fields;
-	}
-	
-	
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/formatter/Formatter.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/formatter/Formatter.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/formatter/Formatter.java	(nonexistent)
@@ -1,8 +0,0 @@
-package eu.dnetlib.data.search.transform.formatter;
-
-import eu.dnetlib.data.search.transform.FormatterException;
-import eu.dnetlib.domain.data.SearchResult;
-
-public interface Formatter {
-	String format(SearchResult result) throws FormatterException;
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/formatter/XmlFormatter.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/formatter/XmlFormatter.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/formatter/XmlFormatter.java	(nonexistent)
@@ -1,15 +0,0 @@
-package eu.dnetlib.data.search.transform.formatter;
-
-import eu.dnetlib.data.search.transform.FormatterException;
-import eu.dnetlib.domain.data.SearchResult;
-
-public class XmlFormatter implements Formatter {
-
-	@Override
-	public String format(SearchResult result) throws FormatterException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/Transformation.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/Transformation.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/Transformation.java	(nonexistent)
@@ -1,5 +0,0 @@
-package eu.dnetlib.data.search.transform.config;
-
-public abstract class Transformation {
-
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/Configuration.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/Configuration.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/Configuration.java	(nonexistent)
@@ -1,100 +0,0 @@
-package eu.dnetlib.data.search.transform.config;
-
-import eu.dnetlib.data.search.utils.vocabulary.Vocabulary;
-
-import java.util.*;
-
-public class Configuration {
-
-	private String configurationName = null;
-	
-	//default locale
-	private Locale defaultLocale = null;
-	
-	//supported locales
-	private List<Locale> locales = new ArrayList<Locale>();
-	
-	//map of transformations per transformer: key-> transformer name, value-> list of all the transformations 
-	private Map<String, List<Transformation>> transformationsMap = new HashMap<String, List<Transformation>>();
-	
-	//map of formatters: key name, value -> xslt
-	private Map<String, FormatterConfiguration> formattersMap = new HashMap<String, FormatterConfiguration>();
-	
-	//contains the vocabularies that are created from index. key-> name, value-> vocabulary 
-	private Map<String, Vocabulary> indexVocabularyMap = new HashMap<String, Vocabulary>();
-	
-	//contains the vocabularies that is loaded from IS. key-> name, value-> vocabulary 
-	private Map<String, Vocabulary> isVocabularyMap = new HashMap<String, Vocabulary>();
-	
-	//contains the vocabularies that is loaded from classpath. key-> name, value-> vocabulary 
-	private Map<String, Vocabulary> localVocabularyMap = new HashMap<String, Vocabulary>();
-	
-	public Configuration(String configurationName) {
-		this.configurationName = configurationName;
-	}
-	
-	public void setConfigurationName(String configurationName) {
-		this.configurationName = configurationName;
-	}
-
-	public String getConfigurationName() {
-		return configurationName;
-	}
-
-	public List<Locale> getLocales() {
-		return locales;
-	}
-
-	public void setLocales(List<Locale> locales) {
-		this.locales = locales;
-	}
-
-	public void setDefaultLocale(Locale defaultLocale) {
-		this.defaultLocale = defaultLocale;
-	}
-
-	public Locale getDefaultLocale() {
-		return defaultLocale;
-	}
-
-	public Map<String, List<Transformation>> getTransformationsMap() {
-		return transformationsMap;
-	}
-
-	public void setTransformationsMap(
-			Map<String, List<Transformation>> transformationsMap) {
-		this.transformationsMap = transformationsMap;
-	}
-
-    public void setIndexVocabularyMap(Map<String, Vocabulary> indexVocabularyMap) {
-		this.indexVocabularyMap = indexVocabularyMap;
-	}
-
-	public Map<String, Vocabulary> getIndexVocabularyMap() {
-		return indexVocabularyMap;
-	}
-
-	public void setIsVocabularyMap(Map<String, Vocabulary> isVocabularyMap) {
-		this.isVocabularyMap = isVocabularyMap;
-	}
-
-	public Map<String, Vocabulary> getIsVocabularyMap() {
-		return isVocabularyMap;
-	}
-
-	public void setLocalVocabularyMap(Map<String, Vocabulary> localVocabularyMap) {
-		this.localVocabularyMap = localVocabularyMap;
-	}
-
-	public Map<String, Vocabulary> getLocalVocabularyMap() {
-		return localVocabularyMap;
-	}
-
-    public Map<String, FormatterConfiguration> getFormattersMap() {
-        return formattersMap;
-    }
-
-    public void setFormattersMap(Map<String, FormatterConfiguration> formattersMap) {
-        this.formattersMap = formattersMap;
-    }
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/FormatterConfiguration.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/FormatterConfiguration.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/FormatterConfiguration.java	(nonexistent)
@@ -1,25 +0,0 @@
-package eu.dnetlib.data.search.transform.config;
-
-/**
- * Created by kiatrop on 23/6/2014.
- */
-public class FormatterConfiguration {
-    private String template;
-    private String xsl_file;
-
-    public String getTemplate() {
-        return template;
-    }
-
-    public void setTemplate(String template) {
-        this.template = template;
-    }
-
-    public String getXsl_file() {
-        return xsl_file;
-    }
-
-    public void setXsl_file(String xsl_file) {
-        this.xsl_file = xsl_file;
-    }
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/SearchFactoryException.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/SearchFactoryException.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/SearchFactoryException.java	(nonexistent)
@@ -1,22 +0,0 @@
-package eu.dnetlib.data.search.transform.config;
-
-@SuppressWarnings("serial")
-public class SearchFactoryException extends Exception {
-
-	public SearchFactoryException() {
-		super();
-	}
-
-	public SearchFactoryException(String message, Throwable cause) {
-		super(message, cause);
-	}
-
-	public SearchFactoryException(String message) {
-		super(message);
-	}
-
-	public SearchFactoryException(Throwable cause) {
-		super(cause);
-	}
-
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/XPathTrasformation.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/XPathTrasformation.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/XPathTrasformation.java	(nonexistent)
@@ -1,37 +0,0 @@
-package eu.dnetlib.data.search.transform.config;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class XPathTrasformation extends Transformation {
-	private String change;
-	private String vocabulary;
-	private List<String> matches;
-
-	public XPathTrasformation(String match, String change, String vocabulary) {
-		this.change = change;
-		this.vocabulary = vocabulary;
-		this.matches = new ArrayList<String>(Arrays.asList(match.split("\\.")));
-	}
-
-	public List<String> getMatches() {
-		return matches;
-	}
-
-	public String getChange() {
-		return change;
-	}
-
-	public void setChange(String change) {
-		this.change = change;
-	}
-
-	public String getVocabulary() {
-		return vocabulary;
-	}
-
-	public void setVocabulary(String vocabulary) {
-		this.vocabulary = vocabulary;
-	}
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/SearchRegistry.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/SearchRegistry.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/SearchRegistry.java	(nonexistent)
@@ -1,215 +0,0 @@
-package eu.dnetlib.data.search.transform.config;
-
-
-import eu.dnetlib.data.search.transform.*;
-import eu.dnetlib.data.search.transform.formatter.Formatter;
-import eu.dnetlib.data.search.transform.formatter.XSLTFormatter;
-import eu.dnetlib.data.search.transform.utils.VelocityUtil;
-import eu.dnetlib.data.search.utils.vocabulary.VocabularyManager;
-import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.VelocityEngine;
-
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.util.*;
-
-public class SearchRegistry implements TransformerRegistry, FormatterRegistry {
-	private Logger logger = Logger.getLogger(this.getClass());
-
-	private Configuration config = null;
-	private VocabularyManager vocabularyManager = null;
-
-	private Map<Locale,HashMap<String,Transformer>> transformers = new HashMap<Locale, HashMap<String,Transformer>>();
-	private Map<String, Formatter> formatters = new HashMap<String, Formatter>();
-
-	@Override
-	public Transformer getTransformer(String name, Locale locale)  {
-		logger.debug("Requested transformer " + name + " locale " + locale);
-		Transformer tx = null;
-
-		if(name == null) {
-			return null;
-		}
-
-		if (locale == null) {
-			locale = config.getDefaultLocale();
-		}
-
-		try {
-			if (this.transformers.get(locale)!= null) {
-				tx = this.transformers.get(locale).get(name);
-
-			} else { //not map for locale
-				logger.debug("Transofrmation map " + config.getTransformationsMap().keySet());
-				tx = createChainTransformer(name, locale,  config.getTransformationsMap().get(name));
-				Map<String, Transformer> map = new HashMap<String, Transformer>();
-				map.put(name, tx);
-				transformers.put(locale, (HashMap<String, Transformer>) map);
-			}
-
-			if (tx == null) { // there is the local map but not the transformer
-				tx = createChainTransformer(name, locale,  config.getTransformationsMap().get(name));
-				transformers.get(locale).put(name, tx);
-			}
-
-		} catch (Exception e) {
-			logger.error("Cannot create transformer " + name, e);
-			throw new IllegalArgumentException("Cannot create transformer " + name, e);
-		}
-
-		logger.debug("Returned in get transformer" + tx);
-		return tx;
-	}
-
-	@Override
-	public Formatter getFormatter(String name) {
-		Formatter fm = this.formatters.get(name);
-
-		try {
-			if (fm == null) {
-				FormatterConfiguration formatterConfiguration = config.getFormattersMap().get(name);
-				String formatterXslt = formatterConfiguration.getXsl_file();
-				String template = formatterConfiguration.getTemplate();
-
-				logger.debug("Configuration for formatter: " + formatterXslt + ", " + template);
-
-				if (formatterXslt == null) {
-					logger.error("Cannot create formatter " + name);
-					throw new IllegalArgumentException("Cannot create formatter " + name);
-				}
-
-				if (template == null) {
-					fm = createFormatter(formatterXslt);
-				} else {
-					fm = createFormatter(formatterXslt, template);
-				}
-
-				formatters.put(name, fm);
-			}
-
-		} catch (Exception e) {
-			logger.error("Cannot create formatter " + name);
-			throw new IllegalArgumentException("Cannot create formatter " + name, e);
-		}
-
-		return fm;
-	}
-
-	private Transformer createChainTransformer(String name, Locale locale, List<Transformation> transformations) throws SearchFactoryException {
-		List<XPathTrasformation> temp = new ArrayList<XPathTrasformation>();
-		List<Transformer> forChaining = new ArrayList<Transformer>();
-		for (Transformation tr: transformations){
-			if (tr instanceof XSLTTransformation) {
-				try {
-					if (!temp.isEmpty()){
-						forChaining.add(createTransformer(locale, temp));
-					}
-					temp.clear();
-					forChaining.add(createTransformer((XSLTTransformation)tr));
-				} catch (Exception e) {
-					logger.warn("Error creating a transformer with name: "+name+" and locale: "+locale.getDisplayName(), e);
-					throw new SearchFactoryException("Error creating a transformer with name: "+name+" and locale: "+locale.getDisplayName(), e);
-
-				}
-			}
-			else {
-				temp.add((XPathTrasformation)tr);
-			}
-		}
-		if (!temp.isEmpty()){
-			try {
-				forChaining.add(createTransformer(locale, temp));
-			} catch (Exception e) {
-				logger.warn("Error creating a transformer with name: " + name + " and locale: "+locale.getDisplayName(), e);
-				throw new SearchFactoryException("Error creating a transformer with name: " + name + " and locale: "+locale.getDisplayName(), e);
-			}
-		}
-		return new ChainTransformer(name, forChaining);
-	}
-
-	private Transformer createTransformer(XSLTTransformation transformation) throws Exception {
-		String xsl_file = transformation.getXslt();
-		InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(xsl_file);
-		StringWriter writer = new StringWriter();
-		IOUtils.copy(inputStream, writer);
-		String xsl = writer.toString();
-
-		XsltTransformer OptimusPrime = new XsltTransformer(xsl);
-
-		writer.close();
-		IOUtils.closeQuietly(inputStream);
-
-		return OptimusPrime;
-	}
-
-	private Transformer createTransformer(Locale locale, List<XPathTrasformation> transformations) throws Exception {
-		VelocityEngine ve = VelocityUtil.getEngine();
-
-		Template t = ve.getTemplate("/eu/dnetlib/data/search/transform/config/velocity.vm", "UTF-8");
-		VelocityContext context = new VelocityContext();
-
-		context.put("locale", locale);
-		context.put("defLocale", config.getDefaultLocale());
-		context.put("transformations", transformations);
-		StringWriter writer = new StringWriter();
-		t.merge(context, writer);
-		XsltTransformer Megatron = new XsltTransformer(writer.toString());
-
-		//logger.debug("Transformer xsl " + Megatron.getXslt());
-		//logger.debug("Vocab paths are: " + loadVocabulariesPathMap(transformations, locale).toString());
-
-		return Megatron;
-	}
-
-	private Formatter createFormatter(String xsl_file) throws Exception {
-		logger.debug("Loading xslt " + xsl_file);
-		InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(xsl_file);
-
-		StringWriter writer = new StringWriter();
-		IOUtils.copy(inputStream, writer);
-		String xsl = writer.toString();
-
-		XSLTFormatter Cybertron = new XSLTFormatter(xsl);
-		writer.close();
-		IOUtils.closeQuietly(inputStream);
-
-		return Cybertron;
-	}
-
-	private Formatter createFormatter(String xsl_file, String template) throws Exception {
-		logger.debug("Loading xslt " + xsl_file);
-		logger.debug("Loading template " + template);
-
-		InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(xsl_file);
-
-		StringWriter writer = new StringWriter();
-		IOUtils.copy(inputStream, writer);
-		String xsl = writer.toString();
-
-		XSLTFormatter Cybertron = new XSLTFormatter(xsl, template);
-		writer.close();
-		IOUtils.closeQuietly(inputStream);
-
-		return Cybertron;
-	}
-
-	public Configuration getConfig() {
-		return config;
-	}
-
-	public void setConfig(Configuration config) {
-		this.config = config;
-	}
-
-	public void setVocabularyManager(VocabularyManager vocabularyManager) {
-		this.vocabularyManager = vocabularyManager;
-	}
-
-	public VocabularyManager getVocabularyManager() {
-		return vocabularyManager;
-	}
-
-}
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/ConfigurationFactoryException.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/ConfigurationFactoryException.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/ConfigurationFactoryException.java	(nonexistent)
@@ -1,21 +0,0 @@
-package eu.dnetlib.data.search.transform.config;
-
-@SuppressWarnings("serial")
-public class ConfigurationFactoryException extends Exception{
-	
-	public ConfigurationFactoryException() {
-		super();
-	}
-
-	public ConfigurationFactoryException(String message, Throwable cause) {
-		super(message, cause);
-	}
-
-	public ConfigurationFactoryException(String message) {
-		super(message);
-	}
-
-	public ConfigurationFactoryException(Throwable cause) {
-		super(cause);
-	}
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/vocabularies/FormatterParams.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/vocabularies/FormatterParams.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/vocabularies/FormatterParams.java	(nonexistent)
@@ -1,25 +0,0 @@
-package eu.dnetlib.data.search.transform.config.vocabularies;
-
-/**
- * Created by kiatrop on 18/6/2014.
- */
-public class FormatterParams {
-    String xsl_file;
-    String template_file;
-
-    public String getXsl_file() {
-        return xsl_file;
-    }
-
-    public void setXsl_file(String xsl_file) {
-        this.xsl_file = xsl_file;
-    }
-
-    public String getTemplate_file() {
-        return template_file;
-    }
-
-    public void setTemplate_file(String template_file) {
-        this.template_file = template_file;
-    }
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/ConfigurationFactory.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/ConfigurationFactory.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/ConfigurationFactory.java	(nonexistent)
@@ -1,211 +0,0 @@
-package eu.dnetlib.data.search.transform.config;
-
-import eu.dnetlib.api.data.SearchService;
-import eu.dnetlib.data.search.utils.vocabulary.ISVocabulary;
-import eu.dnetlib.data.search.utils.vocabulary.IndexVocabulary;
-import eu.dnetlib.data.search.utils.vocabulary.LocalVocabulary;
-import eu.dnetlib.data.search.utils.vocabulary.Vocabulary;
-import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
-import org.springframework.core.io.Resource;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-
-import javax.xml.xpath.*;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.StringTokenizer;
-
-/**
- * 
- * @author kiatrop
- *
- */
-
-/**
- * ConfigurationFactory creates a {@link Configuration} for the {@link SearchService}
- * based on an XML configuration file. 
- * 
- * configurationName is the name of the XML configuration file 
- * vocabulariesPath is the local folder that is the working folder for {@link SearchService}
- * configurationXml has the content of the XML configuration file 
- */
-public class ConfigurationFactory {
-
-	private Resource configurationName;
-	private String vocabulariesPath;
-	private String configurationXml;
-	
-	private static Logger logger = Logger.getLogger(ConfigurationFactory.class);
-	
-	public void init() throws IOException, URISyntaxException {		
-		logger.info("Reading configuration file " + configurationName + " from classpath");
-		
-		InputStream stream = null;
-		
-		try {
-			stream = configurationName.getInputStream();
-			ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
-			IOUtils.copy(stream, baos);
-			
-			this.configurationXml = baos.toString();
-		} finally {
-			IOUtils.closeQuietly(stream);
-		}
-		
-		logger.debug("Configuration read.\n" + configurationXml);
-	}
-	
-	public Configuration createConfiguration(String id) throws ConfigurationFactoryException {
-		Configuration configuration = new Configuration(id);  
-		XPathFactory factory = XPathFactory.newInstance();
-		XPath xPath = factory.newXPath();
-
-		try {
-			readLocales(xPath, configuration);
-			readVocabularies(xPath, configuration);
-			readTransformers(xPath, configuration);
-			readFormatters(xPath, configuration);
-			
-		} catch (XPathExpressionException|IOException ex) {
-			logger.error("Error parsing configuration file.", ex);
-			throw new ConfigurationFactoryException("Error parsing configuration file.", ex);
-			
-		}
-		
-		return configuration;
-	}
-	
-	private void readLocales(XPath xPath, Configuration configuration) throws XPathExpressionException {
-		XPathExpression  xPathExpression = xPath.compile("/configuration/locales/locale");
-		NodeList nodes = (NodeList) xPathExpression.evaluate(
-				new InputSource(new StringReader(configurationXml)), XPathConstants.NODESET);
-					
-		for (int i = 0; i < nodes.getLength(); i++) {
-			StringTokenizer tokenizer = new StringTokenizer(nodes.item(i).getAttributes().getNamedItem("name").getNodeValue(), "_");
-			Locale locale = new Locale(tokenizer.nextToken(), tokenizer.nextToken());
-			configuration.getLocales().add(locale);
-			
-			if (nodes.item(i).getAttributes().getNamedItem("default").getNodeValue().equals("true")) {
-				configuration.setDefaultLocale(locale);
-			}
-		}
-	}
-	
-	private void readVocabularies(XPath xPath, Configuration configuration) throws XPathExpressionException, IOException, ConfigurationFactoryException {		
-		String vocabularyName = null;
-		Vocabulary vocabulary = null;
-		
-		XPathExpression  xPathExpression = xPath.compile("/configuration/vocabularies/local_vocabulary");
-		NodeList nodes = (NodeList) xPathExpression.evaluate(new InputSource(new StringReader(configurationXml)), XPathConstants.NODESET);		
-		for (int i = 0; i < nodes.getLength(); i++) {
-			vocabularyName = nodes.item(i).getAttributes().getNamedItem("name").getNodeValue();
-			vocabulary = new LocalVocabulary(vocabularyName, nodes.item(i).getAttributes().getNamedItem("file").getNodeValue());
-			configuration.getLocalVocabularyMap().put(vocabularyName, vocabulary);
-		}
-		
-		xPathExpression = xPath.compile("/configuration/vocabularies/is_vocabulary");
-		nodes = (NodeList) xPathExpression.evaluate(new InputSource(new StringReader(configurationXml)), XPathConstants.NODESET);
-		
-		for (int i = 0; i < nodes.getLength(); i++) {
-			vocabularyName = nodes.item(i).getAttributes().getNamedItem("name").getNodeValue();
-			String isVocabularyName = nodes.item(i).getAttributes().getNamedItem("xml_name").getNodeValue();
-			vocabulary = new ISVocabulary(vocabularyName, isVocabularyName);
-			configuration.getIsVocabularyMap().put(vocabularyName, vocabulary);
-		}
-		
-		xPathExpression = xPath.compile("/configuration/vocabularies/index_vocabulary");
-		nodes = (NodeList) xPathExpression.evaluate(new InputSource(new StringReader(configurationXml)), XPathConstants.NODESET);
-
-		for (int i = 0; i < nodes.getLength(); i++) {
-			vocabularyName = nodes.item(i).getAttributes().getNamedItem("name").getNodeValue();
-			String query = nodes.item(i).getAttributes().getNamedItem("query").getNodeValue();
-			String transformer = nodes.item(i).getAttributes().getNamedItem("transformer").getNodeValue();			
-			vocabulary = new IndexVocabulary(vocabularyName, query, transformer);
-			configuration.getIndexVocabularyMap().put(vocabularyName, vocabulary);
-		}
-	}
-
-	private void readTransformers(XPath xPath, Configuration configuration) throws XPathExpressionException {
-		XPathExpression xPathExpression = xPath.compile("/configuration/transformers/transformer");
-		NodeList nodes = (NodeList) xPathExpression.evaluate(
-				new InputSource(new StringReader(configurationXml)), XPathConstants.NODESET);
-
-		//per transformer
-		for (int i = 0; i < nodes.getLength(); i++) {
-			NodeList transformationNodes = ((Element) nodes.item(i)).getElementsByTagName("transformation");
-			
-			List<Transformation> transformations = new ArrayList<Transformation>();
-			for (int j=0; j < transformationNodes.getLength(); j++) {
-				Element transformation = (Element) transformationNodes.item(j);
-
-				//logger.debug("Tr " + transformation.getAttributes().getNamedItem("xslt"));
-				if (transformation.getAttributes().getNamedItem("xslt") != null) {
-					transformations.add(new XSLTTransformation(transformation.getAttributes().getNamedItem("xslt").getNodeValue()));
-					//logger.debug("Tr2 " + transformation.getAttributes().getNamedItem("xslt").getNodeValue());
-				} else {
-					String match = transformation.getAttributes().getNamedItem("match").getNodeValue();
-					String change = transformation.getAttributes().getNamedItem("change").getNodeValue();
-					String vocabulary = transformation.getAttributes().getNamedItem("vocabulary").getNodeValue();
-					
-					transformations.add(new XPathTrasformation(match, change, vocabulary));
-				}			
-			}
-			
-			String transformerName = nodes.item(i).getAttributes().getNamedItem("name").getNodeValue();
-			configuration.getTransformationsMap().put(transformerName, transformations);
-
-		}
-	}
-	
-	private void readFormatters(XPath xPath, Configuration configuration) throws XPathExpressionException {
-		XPathExpression xPathExpression = xPath.compile("/configuration/formatters/formatter");
-		NodeList nodes = (NodeList) xPathExpression.evaluate(
-				new InputSource(new StringReader(configurationXml)), XPathConstants.NODESET);
-		
-		//per formatter
-		for (int i = 0; i < nodes.getLength(); i++) {
-            FormatterConfiguration formatterConfiguration = new FormatterConfiguration();
-            formatterConfiguration.setXsl_file(nodes.item(i).getAttributes().getNamedItem("xslt").getNodeValue());
-
-            if (nodes.item(i).getAttributes().getNamedItem("template") != null) {
-                formatterConfiguration.setTemplate(nodes.item(i).getAttributes().getNamedItem("template").getNodeValue());
-            }
-
-            configuration.getFormattersMap().put(
-                nodes.item(i).getAttributes().getNamedItem("name").getNodeValue(), formatterConfiguration);
-			}
-	}
-
-	public void setConfigurationName(Resource configurationName) {
-		this.configurationName = configurationName;
-	}
-
-	public void setVocabulariesPath(String vocabulariesPath) {
-		this.vocabulariesPath = vocabulariesPath;
-	}
-
-	public Resource getConfigurationName() {
-		return configurationName;
-	}
-
-	public String getVocabulariesPath() {
-		return vocabulariesPath;
-	}
-
-	public String getConfigurationXml() {
-		return configurationXml;
-	}
-
-	public static Logger getLogger() {
-		return logger;
-	}
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/XSLTTransformation.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/XSLTTransformation.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/config/XSLTTransformation.java	(nonexistent)
@@ -1,17 +0,0 @@
-package eu.dnetlib.data.search.transform.config;
-
-public class XSLTTransformation extends Transformation {
-	private String xslt;
-
-	public XSLTTransformation(String xslt) {
-		this.xslt = xslt;
-	}
-
-	public void setXslt(String xslt) {
-		this.xslt = xslt;
-	}
-
-	public String getXslt() {
-		return xslt;
-	}
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/ChainTransformer.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/ChainTransformer.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/transform/ChainTransformer.java	(nonexistent)
@@ -1,39 +0,0 @@
-package eu.dnetlib.data.search.transform;
-
-import java.util.List;
-
-public class ChainTransformer implements Transformer {
-
-	private final String name;
-	private final List<Transformer> transformers;
-	//private final Logger logger = Logger.getLogger(ChainTransformer.class);	
-
-	public ChainTransformer(String name, List<Transformer> transformers) {
-		this.name = name;
-		this.transformers = transformers;
-	}
-
-	public List<Transformer> getTransformers() {
-		return transformers;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 *  Applies sequential transformations. 
-	 **/	
-	@Override
-	public String transform(String input) throws TransformerException {
-		String output = null;
-		
-		for (Transformer transformer : transformers) {
-			output = transformer.transform(input);
-			input = output;
-		}
-
-		return output;
-	}
-
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/Query.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/Query.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/Query.java	(nonexistent)
@@ -1,55 +0,0 @@
-/**
- * 
- */
-package eu.dnetlib.data.search.web;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-
-/**
- * @author stoumpos
- *
- */
-public class Query {
-
-	String query;
-	String fields;
-	
-	public String getQuery() {
-		return query;
-	}
-	public void setQuery(String query) {
-		this.query = query;
-	}
-	public String getFields() {
-		return fields;
-	}
-	public void setFields(String fields) {
-		this.fields = fields;
-	}
-	
-	public List<String> parseFields() {
-		if (fields == null) {
-			return null;
-		} else {
-			ArrayList<String> names = new ArrayList<String>();
-			String[] split = fields.split("[ ,\t-]");
-			for (String string : split) {
-				if (string.length() > 0) {
-					names.add(string);
-				}
-			}
-			return names;
-		}
-	}
-
-	/*
-	public static void main(String[] args) {
-		Query q = new Query();
-		q.setFields("  , aa bb bdf, sd ");
-		System.out.println(q.parseFields());
-		
-	}*/
-}

Property changes on: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/Query.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/SearchApiService.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/SearchApiService.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/SearchApiService.java	(nonexistent)
@@ -1,1212 +0,0 @@
-package eu.dnetlib.data.search.web.api;
-
-import eu.dnetlib.api.data.SearchService;
-import eu.dnetlib.api.data.SearchServiceException;
-import eu.dnetlib.data.search.app.SearchServiceImpl;
-import eu.dnetlib.data.search.transform.Transformer;
-import eu.dnetlib.data.search.transform.config.SearchRegistry;
-import eu.dnetlib.data.search.utils.cql.CQLQueryBuilder;
-import eu.dnetlib.data.search.web.utils.RequestResponseHandler;
-import eu.dnetlib.domain.data.SearchResult;
-import io.micrometer.core.annotation.Timed;
-import org.apache.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.List;
-import java.util.Locale;
-
-/**
- * Created by kiatrop on 2/6/2016.
- */
-
-@Component
-@Path("/v2")
-public class SearchApiService {
-
-    private static final Logger logger = Logger.getLogger(SearchApiService.class);
-
-    @Autowired
-    private SearchService searchService = null;
-
-    @Autowired
-    private SearchRegistry searchRegistry = null;
-
-    @GET
-    @Path("/api/resources")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/resources"}, longTask = false)
-    public Response fetchResources(@QueryParam("query") String query,
-                                      @DefaultValue("0") @QueryParam("page") final int offset,
-                                      @DefaultValue("10") @QueryParam("size") final int limit,
-                                      @QueryParam("refine") @DefaultValue("false") final boolean refine,
-                                      @QueryParam("fields") final List<String> fields,
-                                      @QueryParam("fq") final List<String> fieldQueries,
-                                      @QueryParam("format") final String format,
-                                      @QueryParam("type") final String type,
-                                      @Context final HttpServletRequest request) {
-
-        return getResponseByEntity(query, extractEntity(type), offset, limit, format, request, refine, fields, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/publications")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/publications"}, longTask = false)
-    public Response fetchPublications(@QueryParam("q") final String keywords,
-                                      @QueryParam("doi") final String doi,
-                                      @QueryParam("sortBy") final String sortBy,
-                                      @DefaultValue("0") @QueryParam("page") final int offset,
-                                      @DefaultValue("10") @QueryParam("size") final int limit,
-                                      @QueryParam("refine") @DefaultValue("false") final boolean refine,
-                                      @QueryParam("fields") final List<String> fields,
-                                      @QueryParam("fq") final List<String> fieldQueries,
-                                      @QueryParam("format") final String format,
-                                      @Context final HttpServletRequest request) {
-
-        logger.debug("Publications request received");
-        //TODO do not allow q and keywords both - SWITCH back if needed
-        //String simpleQuery = buildSimpleSearchQuery(RequestResponseHandler.Entity.PUBLICATION, keywords) ;
-        String simpleQuery = buildSearchRequest(RequestResponseHandler.Entity.PUBLICATION, keywords, doi,sortBy, fieldQueries);
-        return getResponseByEntity(simpleQuery, RequestResponseHandler.Entity.PUBLICATION, offset, limit, format, request, refine, fields, fieldQueries);
-
-    }
-
-
-    @GET
-    @Path("/api/publications/count")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/publications/count"}, longTask = false)
-    public Response fetchPublicationsCount(@QueryParam("q") String query,
-                                           @QueryParam("format") final String format,
-                                           @QueryParam("fq") final List<String> fieldQueries,
-                                           @Context final HttpServletRequest request)  {
-        String fullQuery = buildSearchRequest(RequestResponseHandler.Entity.PUBLICATION, query, fieldQueries);
-        return getCount(request, fullQuery, format, fieldQueries);
-    }
-
-
-    @GET
-    @Path("/api/publications/{publicationid}")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/publications/{publicationid}"}, longTask = false)
-    public Response fetchPublicationsById(@PathParam("publicationid") String publicationid,
-                                          @QueryParam("format") final String format,
-                                          @QueryParam("fq") final List<String> fieldQueries,
-                                          @Context final HttpServletRequest request) {
-        return getResponseByEntityId(request, RequestResponseHandler.Entity.PUBLICATION, publicationid, format, fieldQueries);
-    }
-
-
-    @GET
-    @Path("/api/datasets")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/datasets"}, longTask = false)
-    public Response fetchDatasets(@QueryParam("q") String keywords,
-                                  @QueryParam("doi") final String doi,
-                                  @QueryParam("sortBy") final String sortBy,
-                                  @DefaultValue("0") @QueryParam("page") int offset,
-                                  @DefaultValue("10") @QueryParam("size") int limit,
-                                  @QueryParam("refine") @DefaultValue("false") boolean refine,
-                                  @QueryParam("fields") final List<String> fields,
-                                  @QueryParam("fq") final List<String> fieldQueries,
-                                  @QueryParam("format") final String format,
-                                  @Context HttpServletRequest request) {
-
-        String simpleQuery = buildSearchRequest(RequestResponseHandler.Entity.DATASET, keywords, doi, sortBy, fieldQueries);
-        return getResponseByEntity(simpleQuery, RequestResponseHandler.Entity.DATASET, offset, limit, format, request, refine, fields, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/datasets/count")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/datasets/count"}, longTask = false)
-    public Response fetchDatesetsCount(@QueryParam("q") String query,
-                                       @QueryParam("format") final String format,
-                                       @QueryParam("fq") final List<String> fieldQueries,
-                                       @Context final HttpServletRequest request)  {
-        String fullQuery = buildSearchRequest(RequestResponseHandler.Entity.DATASET, query, fieldQueries);
-        return getCount(request, fullQuery, format, fieldQueries);
-    }
-
-
-    @GET
-    @Path("/api/datasets/{datasetid}")
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/datasets/{datasetid}"}, longTask = false)
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Response fetchDatasets(@PathParam("datasetid") String datasetid,
-                                  @QueryParam("format") final String format,
-                                  @QueryParam("fq") final List<String> fieldQueries,
-                                  @Context final HttpServletRequest request) {
-        return getResponseByEntityId(request, RequestResponseHandler.Entity.DATASET, datasetid, format, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/software")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/software"}, longTask = false)
-    public Response fetchSoftware(@QueryParam("q") String keywords,
-                                  @QueryParam("doi") final String doi,
-                                  @QueryParam("sortBy") final String sortBy,
-                                  @DefaultValue("0") @QueryParam("page") int offset,
-                                  @DefaultValue("10") @QueryParam("size") int limit,
-                                  @QueryParam("refine") @DefaultValue("false") boolean refine,
-                                  @QueryParam("fields") final List<String> fields,
-                                  @QueryParam("fq") final List<String> fieldQueries,
-                                  @QueryParam("format") final String format,
-                                  @Context HttpServletRequest request) {
-
-        String simpleQuery = buildSearchRequest(RequestResponseHandler.Entity.SOFTWARE, keywords, doi, sortBy, fieldQueries);
-        return getResponseByEntity(simpleQuery, RequestResponseHandler.Entity.SOFTWARE, offset, limit, format, request, refine, fields, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/software/count")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/software/count"}, longTask = false)
-    public Response fetchSoftwareCount(@QueryParam("q") String query,
-                                       @QueryParam("format") final String format,
-                                       @QueryParam("fq") final List<String> fieldQueries,
-                                       @Context final HttpServletRequest request)  {
-        String fullQuery = buildSearchRequest(RequestResponseHandler.Entity.SOFTWARE, query, fieldQueries);
-        return getCount(request, fullQuery, format, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/software/{softwareid}")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/software/{softwareid}"}, longTask = false)
-    public Response fetchSoftware(@PathParam("softwareid") String datasetid,
-                                  @QueryParam("format") final String format,
-                                  @QueryParam("fq") final List<String> fieldQueries,
-                                  @Context final HttpServletRequest request) {
-        return getResponseByEntityId(request, RequestResponseHandler.Entity.SOFTWARE, datasetid, format, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/other")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/other"}, longTask = false)
-    public Response fetchOther(@QueryParam("q") String keywords,
-                                  @QueryParam("doi") final String doi,
-                                  @QueryParam("sortBy") final String sortBy,
-                                  @DefaultValue("0") @QueryParam("page") int offset,
-                                  @DefaultValue("10") @QueryParam("size") int limit,
-                                  @QueryParam("refine") @DefaultValue("false") boolean refine,
-                                  @QueryParam("fields") final List<String> fields,
-                                  @QueryParam("fq") final List<String> fieldQueries,
-                                  @QueryParam("format") final String format,
-                                  @Context HttpServletRequest request) {
-
-        String simpleQuery = buildSearchRequest(RequestResponseHandler.Entity.OTHER, keywords, doi, sortBy, fieldQueries);
-        return getResponseByEntity(simpleQuery, RequestResponseHandler.Entity.OTHER, offset, limit, format, request, refine, fields, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/other/count")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/other"}, longTask = false)
-    public Response fetchOtherCount(@QueryParam("q") String query,
-                                       @QueryParam("format") final String format,
-                                       @QueryParam("fq") final List<String> fieldQueries,
-                                       @Context final HttpServletRequest request)  {
-        String fullQuery = buildSearchRequest(RequestResponseHandler.Entity.OTHER, query, fieldQueries);
-        return getCount(request, fullQuery, format, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/other/{otherid}")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/other/{otherid}"}, longTask = false)
-    public Response fetchOther(@PathParam("otherid") String datasetid,
-                                  @QueryParam("format") final String format,
-                                  @QueryParam("fq") final List<String> fieldQueries,
-                                  @Context final HttpServletRequest request) {
-        return getResponseByEntityId(request, RequestResponseHandler.Entity.OTHER, datasetid, format, fieldQueries);
-    }
-    @GET
-    @Path("/api/projects")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/projects"}, longTask = false)
-    public Response fetchProjects(@QueryParam("q") String keywords,
-                                  @DefaultValue("0") @QueryParam("page") int offset,
-                                  @DefaultValue("10") @QueryParam("size") int limit,
-                                  @QueryParam("refine") @DefaultValue("false") boolean refine,
-                                  @QueryParam("fields") final List<String> fields,
-                                  @QueryParam("fq") final List<String> fieldQueries,
-                                  @QueryParam("format") final String format,
-                                  @Context HttpServletRequest request) {
-
-        String simpleQuery = buildSearchRequest(RequestResponseHandler.Entity.PROJECT, keywords, fieldQueries);
-        return getResponseByEntity(simpleQuery, RequestResponseHandler.Entity.PROJECT, offset, limit, format, request, refine, fields, fieldQueries);
-    }
-
-
-    @GET
-    @Path("/api/projects/count")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/projects/count"}, longTask = false)
-    public Response fetchProjectsCount(@QueryParam("q") String query,
-                                       @QueryParam("format") final String format,
-                                       @QueryParam("fq") final List<String> fieldQueries,
-                                       @Context final HttpServletRequest request) {
-        String fullQuery = buildSearchRequest(RequestResponseHandler.Entity.PROJECT, query, fieldQueries);
-        return getCount(request, fullQuery, format, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/projects/{projectid}")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/projects/{projectid}"}, longTask = false)
-    public Response fetchProjects(@PathParam("projectid") String projectid,
-                                  @QueryParam("format") final String format,
-                                  @QueryParam("fq") final List<String> fieldQueries,
-                                  @Context final HttpServletRequest request) {
-        return getResponseByEntityId(request, RequestResponseHandler.Entity.PROJECT, projectid, format, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/projects/{projectId}/publications")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/projects/{projectid}/publications"}, longTask = false)
-    public Response fetchProjectPublications(@PathParam("projectId") String projectId,
-                                             @DefaultValue("0") @QueryParam("page") int offset,
-                                             @DefaultValue("10") @QueryParam("size") int limit,
-                                             @QueryParam("format") final String format,
-                                             @QueryParam("fq") final List<String> fieldQueries,
-                                             @Context HttpServletRequest request)  {
-
-        String fullQuery = builtEntity2EntityRelationQuery(RequestResponseHandler.Entity.PUBLICATION, "relprojectid", projectId, fieldQueries);
-        return getResponseByEntity(fullQuery, RequestResponseHandler.Entity.PUBLICATION, offset, limit, format, request, false, null, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/projects/{projectId}/publications/count")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/projects/{projectid}/publications/count"}, longTask = false)
-    public Response fetchProjectPublicationsCount(@PathParam("projectId") String projectId,
-                                                  @QueryParam("format") final String format,
-                                                  @QueryParam("fq") final List<String> fieldQueries,
-                                                  @Context final HttpServletRequest request) {
-        String fullQuery = builtEntity2EntityRelationQuery(RequestResponseHandler.Entity.PUBLICATION, "relprojectid", projectId, fieldQueries);
-        return getCount(request, fullQuery, format, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/projects/{projectId}/datasets")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/projects/{projectId}/datasets"}, longTask = false)
-    public Response fetchProjectDatasets(@PathParam("projectId") String projectId,
-                                             @DefaultValue("0") @QueryParam("page") int offset,
-                                             @DefaultValue("10") @QueryParam("size") int limit,
-                                             @QueryParam("format") final String format,
-                                             @QueryParam("fq") final List<String> fieldQueries,
-                                             @Context HttpServletRequest request)  {
-
-        String fullQuery = builtEntity2EntityRelationQuery(RequestResponseHandler.Entity.DATASET, "relprojectid", projectId, fieldQueries);
-        return getResponseByEntity(fullQuery, RequestResponseHandler.Entity.DATASET, offset, limit, format, request, false, null, fieldQueries);
-    }
-
-
-    @GET
-    @Path("/api/projects/{projectId}/datasets/count")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/projects/{projectId}/datasets/count"}, longTask = false)
-    public Response fetchProjectDatasetsCount(@PathParam("projectId") String projectId,
-                                              @DefaultValue("0") @QueryParam("page") int offset,
-                                              @DefaultValue("10") @QueryParam("size") int limit,
-                                              @QueryParam("format") final String format,
-                                              @QueryParam("fq") final List<String> fieldQueries,
-                                              @Context HttpServletRequest request)  {
-        String fullQuery = builtEntity2EntityRelationQuery(RequestResponseHandler.Entity.DATASET, "relprojectid", projectId, fieldQueries);
-        return getCount(request, fullQuery, format, fieldQueries);
-    }
-
-
-
-    @GET
-    @Path("/api/projects/{projectId}/software/count")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/projects/{projectId}/software/count"}, longTask = false)
-    public Response fetchProjectSoftwareCount(@PathParam("projectId") String projectId,
-                                              @DefaultValue("0") @QueryParam("page") int offset,
-                                              @DefaultValue("10") @QueryParam("size") int limit,
-                                              @QueryParam("format") final String format,
-                                              @QueryParam("fq") final List<String> fieldQueries,
-                                              @Context HttpServletRequest request)  {
-        String fullQuery = builtEntity2EntityRelationQuery(RequestResponseHandler.Entity.SOFTWARE, "relprojectid", projectId, fieldQueries);
-        return getCount(request, fullQuery, format, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/projects/{projectId}/software")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/projects/{projectId}/software"}, longTask = false)
-    public Response fetchProjectSoftware(@PathParam("projectId") String projectId,
-                                         @DefaultValue("0") @QueryParam("page") int offset,
-                                         @DefaultValue("10") @QueryParam("size") int limit,
-                                         @QueryParam("format") final String format,
-                                         @QueryParam("fq") final List<String> fieldQueries,
-                                         @Context HttpServletRequest request)  {
-
-        String fullQuery = builtEntity2EntityRelationQuery(RequestResponseHandler.Entity.SOFTWARE, "relprojectid", projectId, fieldQueries);
-        return getResponseByEntity(fullQuery, RequestResponseHandler.Entity.SOFTWARE, offset, limit, format, request, false, null, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/projects/{projectId}/other/count")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/projects/{projectId}/other/count"}, longTask = false)
-    public Response fetchProjectOtherCount(@PathParam("projectId") String projectId,
-                                              @DefaultValue("0") @QueryParam("page") int offset,
-                                              @DefaultValue("10") @QueryParam("size") int limit,
-                                              @QueryParam("format") final String format,
-                                              @QueryParam("fq") final List<String> fieldQueries,
-                                              @Context HttpServletRequest request)  {
-        String fullQuery = builtEntity2EntityRelationQuery(RequestResponseHandler.Entity.OTHER, "relprojectid", projectId, fieldQueries);
-        return getCount(request, fullQuery, format, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/projects/{projectId}/other")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/projects/{projectId}/other"}, longTask = false)
-    public Response fetchProjectOther(@PathParam("projectId") String projectId,
-                                         @DefaultValue("0") @QueryParam("page") int offset,
-                                         @DefaultValue("10") @QueryParam("size") int limit,
-                                         @QueryParam("format") final String format,
-                                         @QueryParam("fq") final List<String> fieldQueries,
-                                         @Context HttpServletRequest request)  {
-
-        String fullQuery = builtEntity2EntityRelationQuery(RequestResponseHandler.Entity.OTHER, "relprojectid", projectId, fieldQueries);
-        return getResponseByEntity(fullQuery, RequestResponseHandler.Entity.OTHER, offset, limit, format, request, false, null, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/datasources")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/datasources"}, longTask = false)
-    public Response fetchDatasources(@QueryParam("q") String keywords,
-                                     @DefaultValue("0") @QueryParam("page") final int offset,
-                                     @DefaultValue("10") @QueryParam("size") final int limit,
-                                     @QueryParam("refine") @DefaultValue("false") final boolean refine,
-                                     @QueryParam("fields") final List<String> fields,
-                                     @QueryParam("fq") final List<String> fieldQueries,
-                                     @QueryParam("format") final String format,
-                                     @Context final HttpServletRequest request) {
-
-        String simpleQuery = buildSearchRequest(RequestResponseHandler.Entity.DATASOURCE, keywords, fieldQueries);
-        return getResponseByEntity(simpleQuery, RequestResponseHandler.Entity.DATASOURCE, offset, limit, format, request, refine, fields, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/datasources/count")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/datasources/count"}, longTask = false)
-    public Response fetchDatasourcesCount(@QueryParam("q") String query,
-                                          @QueryParam("format") final String format,
-                                          @QueryParam("fq") final List<String> fieldQueries,
-                                          @Context final HttpServletRequest request) {
-        String fullQuery = buildSearchRequest(RequestResponseHandler.Entity.DATASOURCE, query, fieldQueries);
-        return getCount(request, fullQuery, format, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/datasources/{datasourceid}")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/datasources/{datasourceid}"}, longTask = false)
-    public Response fetchDatasources(@PathParam("datasourceid") String datasourceid,
-                                     @QueryParam("format") final String format,
-                                     @QueryParam("fq") final List<String> fieldQueries,
-                                     @Context final HttpServletRequest request) {
-        return getResponseByEntityId(request, RequestResponseHandler.Entity.DATASOURCE, datasourceid, format, fieldQueries);
-    }
-
-
-    @GET
-    @Path("/api/organizations")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/organizations"}, longTask = false)
-    public Response fetchOrganisations(@QueryParam("q") String keywords,
-                                       @DefaultValue("0") @QueryParam("page") final int offset,
-                                       @DefaultValue("10") @QueryParam("size") final int limit,
-                                       @QueryParam("refine") @DefaultValue("false") final boolean refine,
-                                       @QueryParam("fields") final List<String> fields,
-                                       @QueryParam("fq") final List<String> fieldQueries,
-                                       @QueryParam("format") final String format,
-                                       @Context final HttpServletRequest request) {
-
-        String simpleQuery = buildSearchRequest(RequestResponseHandler.Entity.ORGANIZATION, keywords, fieldQueries);
-        return getResponseByEntity(simpleQuery, RequestResponseHandler.Entity.ORGANIZATION, offset, limit, format, request, refine, fields, fieldQueries);
-    }
-
-
-    @GET
-    @Path("/api/organizations/count")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/organizations/count"}, longTask = false)
-    public Response fetchOrganizationsCount(@QueryParam("q") String query,
-                                            @QueryParam("format") final String format,
-                                            @QueryParam("fq") final List<String> fieldQueries,
-                                            @Context final HttpServletRequest request) {
-        String fullQuery = buildSearchRequest(RequestResponseHandler.Entity.ORGANIZATION, query, fieldQueries);
-        return getCount(request, fullQuery, format, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/organizations/{organizationid}")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/organizations/{organizationid}"}, longTask = false)
-    public Response fetchOrganizations(@PathParam("organizationid") String organizationid,
-                                       @QueryParam("format") final String format,
-                                       @QueryParam("fq") final List<String> fieldQueries,
-                                       @Context final HttpServletRequest request) {
-        return getResponseByEntityId(request, RequestResponseHandler.Entity.ORGANIZATION, organizationid, format, fieldQueries);
-    }
-
-
-    @GET
-    @Path("/api/organizations/{organizationid}/datasources")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/organizations/{organizationid}/datasources"}, longTask = false)
-    public Response fetchOrganizationDatasources(@PathParam("organizationid") String organizationid,
-                                                 @DefaultValue("0") @QueryParam("page") int offset,
-                                                 @DefaultValue("10") @QueryParam("size") int limit,
-                                                 @QueryParam("format") final String format,
-                                                 @QueryParam("fq") final List<String> fieldQueries,
-                                                 @Context HttpServletRequest request)  {
-        String fullQuery = builtEntity2EntityRelationQuery(RequestResponseHandler.Entity.DATASOURCE, "relorganizationid", organizationid, fieldQueries);
-        return getResponseByEntity(fullQuery, RequestResponseHandler.Entity.DATASOURCE, offset, limit, format, request, false, null, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/organizations/{organizationid}/datasources/count")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/organizations/{organizationid}/datasources/count"}, longTask = false)
-    public Response fetchOrganizationDatasources(@PathParam("organizationid") String organizationid,
-                                                 @QueryParam("format") final String format,
-                                                 @QueryParam("fq") final List<String> fieldQueries,
-                                                 @Context final HttpServletRequest request) {
-        String fullQuery = builtEntity2EntityRelationQuery(RequestResponseHandler.Entity.DATASOURCE, "relorganizationid", organizationid, fieldQueries);
-        return getCount(request, fullQuery, format, fieldQueries);
-    }
-
-
-    @GET
-    @Path("/api/organizations/{organizationid}/publications")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/organizations/{organizationid}/publications"}, longTask = false)
-    public Response fetchOrganizationPublications(@PathParam("organizationid") String organizationid,
-                                              @DefaultValue("0") @QueryParam("page") int offset,
-                                              @DefaultValue("10") @QueryParam("size") int limit,
-                                              @QueryParam("format") final String format,
-                                              @QueryParam("fq") final List<String> fieldQueries,
-                                              @Context HttpServletRequest request)  {
-        String fullQuery = builtEntity2EntityRelationQuery(RequestResponseHandler.Entity.PUBLICATION, "relorganizationid", organizationid, fieldQueries);
-        return getResponseByEntity(fullQuery, RequestResponseHandler.Entity.PUBLICATION, offset, limit, format, request, false, null, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/organizations/{organizationid}/publications/count")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/organizations/{organizationid}/publications/count"}, longTask = false)
-    public Response fetchOrganizationPublicationsCount(@PathParam("organizationid") String organizationid,
-                                                  @DefaultValue("0") @QueryParam("page") int offset,
-                                                  @DefaultValue("10") @QueryParam("size") int limit,
-                                                  @QueryParam("format") final String format,
-                                                  @QueryParam("fq") final List<String> fieldQueries,
-                                                  @Context HttpServletRequest request)  {
-        String fullQuery = builtEntity2EntityRelationQuery(RequestResponseHandler.Entity.PUBLICATION, "relorganizationid", organizationid, fieldQueries);
-        return getCount(request, fullQuery, format, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/organizations/{organizationid}/datasets")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/organizations/{organizationid}/datasets"}, longTask = false)
-    public Response fetchOrganizationDatsets(@PathParam("organizationid") String organizationid,
-                                                  @DefaultValue("0") @QueryParam("page") int offset,
-                                                  @DefaultValue("10") @QueryParam("size") int limit,
-                                                  @QueryParam("format") final String format,
-                                                  @QueryParam("fq") final List<String> fieldQueries,
-                                                  @Context HttpServletRequest request)  {
-        String fullQuery = builtEntity2EntityRelationQuery(RequestResponseHandler.Entity.DATASET, "relorganizationid", organizationid, fieldQueries);
-        return getResponseByEntity(fullQuery, RequestResponseHandler.Entity.DATASET, offset, limit, format, request, false, null, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/organizations/{organizationid}/datasets/count")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/organizations/{organizationid}/datasets/count"}, longTask = false)
-    public Response fetchOrganizationDatsetsCount(@PathParam("organizationid") String organizationid,
-                                             @DefaultValue("0") @QueryParam("page") int offset,
-                                             @DefaultValue("10") @QueryParam("size") int limit,
-                                             @QueryParam("format") final String format,
-                                             @QueryParam("fq") final List<String> fieldQueries,
-                                             @Context HttpServletRequest request)  {
-        String fullQuery = builtEntity2EntityRelationQuery(RequestResponseHandler.Entity.DATASET, "relorganizationid", organizationid, fieldQueries);
-        return getCount(request, fullQuery, format, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/organizations/{organizationid}/projects")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/organizations/{organizationid}/projects"}, longTask = false)
-    public Response fetchOrganizationProjects(@PathParam("organizationid") String organizationid,
-                                                 @DefaultValue("0") @QueryParam("page") int offset,
-                                                 @DefaultValue("10") @QueryParam("size") int limit,
-                                                 @QueryParam("format") final String format,
-                                                 @QueryParam("fq") final List<String> fieldQueries,
-                                                 @Context HttpServletRequest request)  {
-        String fullQuery = builtEntity2EntityRelationQuery(RequestResponseHandler.Entity.PROJECT, "relorganizationid", organizationid, fieldQueries);
-        return getResponseByEntity(fullQuery, RequestResponseHandler.Entity.PROJECT, offset, limit, format, request, false, null, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/organizations/{organizationid}/projects/count")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/organizations/{organizationid}/projects/count"}, longTask = false)
-    public Response fetchOrganizationProjectsCount(@PathParam("organizationid") String organizationid,
-                                                   @QueryParam("format") final String format,
-                                                   @QueryParam("fq") final List<String> fieldQueries,
-                                                   @Context final HttpServletRequest request) {
-        String fullQuery = builtEntity2EntityRelationQuery(RequestResponseHandler.Entity.PROJECT, "relorganizationid", organizationid, fieldQueries);
-        return getCount(request, fullQuery,format, fieldQueries);
-    }
-
-/*
-
-    @GET
-    @Path("/api/people")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Response fetchPeople(@QueryParam("q") String keywords,
-                                @DefaultValue("0") @QueryParam("page") final int offset,
-                                @DefaultValue("10") @QueryParam("size") final int limit,
-                                @QueryParam("refine") @DefaultValue("false") final boolean refine,
-                                @QueryParam("fields") final List<String> fields,
-                                @QueryParam("fq") final List<String> fieldQueries,
-                                @QueryParam("format") final String format,
-                                @Context final HttpServletRequest request) {
-
-        String simpleQuery = buildSearchRequest(RequestResponseHandler.Entity.PERSON, keywords, fieldQueries);
-        return getResponseByEntity(simpleQuery, RequestResponseHandler.Entity.PERSON, offset, limit, format, request, refine, fields, fieldQueries);
-    }
-
-
-    @GET
-    @Path("/api/people/count")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Response fetchPeopleCount(@QueryParam("q") String query,
-                                     @QueryParam("format") final String format,
-                                     @QueryParam("fq") final List<String> fieldQueries,
-                                     @Context final HttpServletRequest request) {
-        String fullQuery = buildSearchRequest(RequestResponseHandler.Entity.PERSON, query, fieldQueries);
-        return getCount(request, fullQuery, format, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/people/{personid}")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Response fetchPeople(@PathParam("personid") String personid,
-                                @QueryParam("format") final String format,
-                                @QueryParam("fq") final List<String> fieldQueries,
-                                @Context final HttpServletRequest request) {
-        return getResponseByEntityId(request, RequestResponseHandler.Entity.PERSON, personid, format, fieldQueries);
-    }
-
-
-    @GET
-    @Path("/api/people/{personid}/publications")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Response fetchPeoplePublications(@PathParam("personid") String personid,
-                                            @DefaultValue("0") @QueryParam("page") final int offset,
-                                            @DefaultValue("10") @QueryParam("size") final int limit,
-                                            @QueryParam("format") final String format,
-                                            @QueryParam("fq") final List<String> fieldQueries,
-                                            @Context final HttpServletRequest request) {
-        String fullQuery = builtEntity2EntityRelationQuery(RequestResponseHandler.Entity.PUBLICATION, "relpersonid", personid, fieldQueries);
-        return getResponseByEntity(fullQuery, RequestResponseHandler.Entity.PUBLICATION, offset, limit, format, request, false, null, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/people/{personid}/publications/count")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Response fetchPeoplePublicationsCount(@PathParam("personid") String personid,
-                                                 @QueryParam("format") final String format,
-                                                 @QueryParam("fq") final List<String> fieldQueries,
-                                                 @Context final HttpServletRequest request) {
-        String fullQuery = builtEntity2EntityRelationQuery(RequestResponseHandler.Entity.PUBLICATION, "relpersonid", personid, fieldQueries);
-        return getCount(request, fullQuery, format, fieldQueries);
-    }
-
-
-    @GET
-    @Path("/api/people/{personid}/datasets")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Response fetchPeopleDatasets(@PathParam("personid") String personid,
-                                        @DefaultValue("0") @QueryParam("page") final int offset,
-                                        @DefaultValue("10") @QueryParam("size") final int limit,
-                                        @QueryParam("format") final String format,
-                                        @QueryParam("fq") final List<String> fieldQueries,
-                                        @Context final HttpServletRequest request) {
-        String fullQuery = builtEntity2EntityRelationQuery(RequestResponseHandler.Entity.DATASET, "relpersonid", personid, fieldQueries);
-        return getResponseByEntity(fullQuery, RequestResponseHandler.Entity.DATASET, offset, limit, format, request, false, null, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/people/{personid}/datasets/count")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Response fetchPeopleDatasetsCount(@PathParam("personid") String personid,
-                                             @QueryParam("format") final String format,
-                                             @QueryParam("fq") final List<String> fieldQueries,
-                                             @Context final HttpServletRequest request) {
-        String fullQuery = builtEntity2EntityRelationQuery(RequestResponseHandler.Entity.DATASET, "relpersonid", personid, fieldQueries);
-        return getCount(request, fullQuery, format, fieldQueries);
-    }
-*/
-    @GET
-    @Path("/api/reports")
-    @Produces(MediaType.TEXT_PLAIN)
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "portal", "uri", "/rest/v2/api/reports"}, longTask = false)
-    public Response fetchReport(@QueryParam("q") String keywords,
-                                @QueryParam("refine") @DefaultValue("false") boolean refine,
-                                @QueryParam("fields") final List<String> fields,
-                                @QueryParam("fq") final List<String> fieldQueries,
-                                @QueryParam("type") final String type,
-                                @QueryParam("format") final String format,
-                                @Context final HttpServletResponse response) {
-
-        logger.debug("Reports request received");
-
-        if (type == null || type.isEmpty()) {
-            return Response.status(Response.Status.BAD_REQUEST).entity(APIResponseFormatter.
-                    compose500Message(MediaType.APPLICATION_JSON, "Fail to fetch report.", "The 'type' parameter is missing.")).build();
-        }
-
-        long startTime = System.nanoTime();
-        final RequestResponseHandler.Entity entity =  extractEntity(type);
-        final Transformer transformer = extractTransformer(format, extractEntity(type));
-        final boolean special = isSpecialFormat(format);
-        String responseType =  extractResponseFormat(format);
-
-        final String fullQuery = buildSearchRequest(entity, keywords, fieldQueries);
-        logger.debug("fullquery " + fullQuery);
-        logger.debug("fieldQueries " + fieldQueries);
-
-        try {
-            SearchResult sr = ((SearchServiceImpl)searchService).newSearch(fullQuery, Locale.getDefault().toString(), fields, fieldQueries,0, 0, format, transformer,null,false);
-            logger.debug("Total number of results " + sr.getTotal());
-            
-            if (sr.getTotal() > 10000) {
-                return Response.status(Response.Status.BAD_REQUEST).entity(APIResponseFormatter.
-                        compose500Message(MediaType.APPLICATION_JSON, "Fail to fetch report.", "You have exceeded the number of allowed returned results")).build();
-            }
-
-        } catch (SearchServiceException sse) {
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(APIResponseFormatter.
-                    compose500Message(MediaType.APPLICATION_JSON, "Fail to fetch report.", sse.getMessage())).build();
-        }
-
-        StreamingOutput stream = new StreamingOutput() {
-            @Override
-            public void write(OutputStream os) throws IOException, WebApplicationException
-            {
-                if (hasTitle(format) && !format.equals("html")) {
-                    os.write(CSVResponseFormat.appendTitle(entity, special).getBytes());
-                }
-                try {
-                    ((SearchServiceImpl)searchService).cursorSearch(fullQuery, fields, fieldQueries, format, transformer, os);
-
-                } catch (SearchServiceException sse) {
-                    os.write(("Fail to return report. " + sse.getMessage()).getBytes());
-                    logger.warn("Fail to return report. ", sse);
-                }
-                
-                //os.close();
-            }
-
-        };
-
-        long estimatedTime = System.nanoTime() - startTime;
-        logger.debug("Reports search time " + estimatedTime/1000000 +  " milliseconds");
-        return Response.ok().entity(stream).type(responseType).build();
-    }
-
-    private String extractResponseFormat(String format) {
-        if (format != null && !format.isEmpty()) {
-            if (format.equalsIgnoreCase("json")) {
-                return MediaType.APPLICATION_JSON;
-
-            } else if (format.contains("csv")) {
-                return new MediaType("text", "csv").toString();
-
-            }  else if (format.equalsIgnoreCase("tsv")) {
-                return new MediaType("text", "tsv").toString();
-
-            } else if (format.equalsIgnoreCase("html")) {
-                return MediaType.TEXT_HTML;
-            }
-        }
-
-        return MediaType.APPLICATION_XML;
-    }
-
-    private boolean isSpecialFormat(String format) {
-        if (format != null && format.toLowerCase().contains("special")) {
-            return true;
-        }
-        return false;
-    }
-
-    private boolean hasTitle(String format) {
-        if (format != null && format.toLowerCase().contains("notitle")) {
-            return false;
-        }
-        return true;
-    }
-
-    //TODO differentiate for html + add special controls for format support
-    private Transformer extractTransformer(String format, RequestResponseHandler.Entity entity) {
-        if (searchRegistry == null) { return  null;}
-
-        if (format != null && (format.toLowerCase().contains("csv") || format.equalsIgnoreCase("html"))) {
-            logger.debug("Extracting transformer...." + format + "_" + entity);
-            return searchRegistry.getTransformer(format.replaceAll("-notitle","") + "_" + entity, Locale.getDefault());
-
-        }
-
-        return null;
-    }
-
-    //TODO old way of creating query see if needed.
-    /*private String buildSimpleSearchQuery(RequestResponseHandler.Entity entity, String keywords) {
-        StringBuilder queryBuilder = new StringBuilder();
-        enhanceQueryWithEntityType(queryBuilder, entity);
-        builtQueryKeywords(queryBuilder, cleanKeywords(keywords));
-        return queryBuilder.toString();
-    }*/
-
-    private String cleanKeywords(String keywords) {
-        if (keywords != null) {
-            return keywords.replaceAll("[\\\\/:*?<>|()]", "");
-        }
-        return keywords;
-    }
-
-    private String cleanId(String entityId) {
-        return entityId.replaceAll("\"", "");
-    }
-
-    private String buildSearchRequest(RequestResponseHandler.Entity entity, String keywords, String doi, String sortBy, List<String> fieldQueries) {
-        enhanceFieldQueryWithEntityType(entity, fieldQueries);
-
-        StringBuilder queryBuilder = new StringBuilder();
-        if (doi != null && !doi.trim().isEmpty()) {
-            queryBuilder.append("(pidclassid exact \"doi\" and pid exact " + doi + ")");
-        }
-
-        builtQueryKeywords(queryBuilder, keywords);
-        enhanceWithSortParameter(queryBuilder, sortBy);
-
-        return queryBuilder.toString();
-    }
-
-    private String buildSearchRequest(RequestResponseHandler.Entity entity, String keywords, List<String> fieldQueries) {
-        enhanceFieldQueryWithEntityType(entity, fieldQueries);
-
-        StringBuilder queryBuilder = new StringBuilder();
-        builtQueryKeywords(queryBuilder, keywords);
-
-        return queryBuilder.toString();
-    }
-
-    private void enhanceFieldQueryWithEntityType(RequestResponseHandler.Entity entity, List<String> fieldQueries) {
-        for (String fieldQuery: entity.getFieldQueries()) {
-            logger.debug("adding " + fieldQuery);
-            fieldQueries.add(fieldQuery);
-        }
-    }
-
-    private void builtQueryKeywords(StringBuilder queryBuilder, String keywords) {
-        if (keywords != null && !keywords.trim().isEmpty()) {
-            CQLQueryBuilder.appendKeywords(queryBuilder, cleanKeywords(keywords));
-        }
-
-        if (queryBuilder.toString().isEmpty()) {
-            queryBuilder.append("(*)");
-        }
-    }
-
-    private void builtEntityIdQuery(StringBuilder queryBuilder, RequestResponseHandler.Entity entity, String entityId, List<String> fieldQueries){
-        enhanceFieldQueryWithEntityType(entity, fieldQueries);
-        enhanceQueryWithEntityId(queryBuilder, entity, cleanId(entityId));
-    }
-
-    /* Queries with pids are only valid with deleted by inderence marked as true */
-    private void resultPidQuery(StringBuilder queryBuilder, RequestResponseHandler.Entity entity, String resultPid, List<String> fieldQueries){
-        builtDeletedByInferenceQuery(queryBuilder);
-        if (entity == RequestResponseHandler.Entity.ORGANIZATION) {
-            enhanceFieldQueryWithEntityType(entity, fieldQueries);
-        } else if (entity != RequestResponseHandler.Entity.NONE) {
-            throw new IllegalArgumentException("Entity " + entity.toString() + " is not supported.");
-        }
-        enhanceQueryWithPid(queryBuilder, entity, cleanId(resultPid));
-    }
-
-    private void builtDeletedByInferenceQuery(StringBuilder queryBuilder) {
-        CQLQueryBuilder.appendFieldTerm(queryBuilder, CQLQueryBuilder.Operator.NONE, "deletedByInference", CQLQueryBuilder.Operator.EQUAL, "true");
-    }
-
-    private String builtEntity2EntityRelationQuery(RequestResponseHandler.Entity entity, String relationfield, String entityId, List<String> fieldQueries){
-        StringBuilder queryBuilder = new StringBuilder();
-        //enhanceQueryWithEntityType(queryBuilder, entity);
-        enhanceFieldQueryWithEntityType(entity, fieldQueries);
-        enhanceQueryWithRelationId(queryBuilder, relationfield, cleanId(entityId));
-        return queryBuilder.toString();
-    }
-
-    private void enhanceQueryWithRelationId(StringBuilder queryBuilder, String relationfield, String entityId) {
-        if (!queryBuilder.toString().isEmpty()) {
-            CQLQueryBuilder.appendFieldTerm(queryBuilder, CQLQueryBuilder.Operator.AND, " " + relationfield + " ", CQLQueryBuilder.Operator.EXACT, entityId);
-
-        } else {
-            CQLQueryBuilder.appendFieldTerm(queryBuilder, CQLQueryBuilder.Operator.NONE, relationfield + " ", CQLQueryBuilder.Operator.EXACT, entityId);
-        }
-    }
-
-    private void enhanceQueryWithEntityId(StringBuilder queryBuilder, RequestResponseHandler.Entity entity, String entityId) {
-        if (queryBuilder.toString().isEmpty()) {
-            CQLQueryBuilder.appendFieldTerm(queryBuilder, CQLQueryBuilder.Operator.NONE, "objidentifier", CQLQueryBuilder.Operator.EXACT, entityId);
-        } else {
-            CQLQueryBuilder.appendFieldTerm(queryBuilder, CQLQueryBuilder.Operator.AND, "objidentifier", CQLQueryBuilder.Operator.EXACT, entityId);
-        }
-
-        if (entity == RequestResponseHandler.Entity.PUBLICATION || entity == RequestResponseHandler.Entity.DATASET
-                || entity == RequestResponseHandler.Entity.SOFTWARE || entity == RequestResponseHandler.Entity.OTHER) {
-            CQLQueryBuilder.appendFieldTerm(queryBuilder, CQLQueryBuilder.Operator.OR, "resultdupid", CQLQueryBuilder.Operator.EXACT, entityId);
-
-        } else if (entity == RequestResponseHandler.Entity.ORGANIZATION) {
-            CQLQueryBuilder.appendFieldTerm(queryBuilder, CQLQueryBuilder.Operator.OR, "organizationdupid", CQLQueryBuilder.Operator.EXACT, entityId);
-        }
-    }
-
-
-
-    private void enhanceQueryWithPid(StringBuilder queryBuilder, RequestResponseHandler.Entity entity, String entityId) {
-        if (entity == RequestResponseHandler.Entity.NONE) {
-            CQLQueryBuilder.appendFieldTerm(queryBuilder, CQLQueryBuilder.Operator.AND, "resultdupid", CQLQueryBuilder.Operator.EXACT, entityId);
-
-        } else if (entity == RequestResponseHandler.Entity.ORGANIZATION) {
-            CQLQueryBuilder.appendFieldTerm(queryBuilder, CQLQueryBuilder.Operator.AND, "organizationdupid", CQLQueryBuilder.Operator.EXACT, entityId);
-
-        } else {
-            throw new IllegalArgumentException("The entity " + entity.toString() + " is not supported.");
-        }
-    }
-
-    private void enhanceWithSortParameter(StringBuilder queryBuilder, String sortBy) {
-        if (sortBy != null) {
-            String[] sortParams = sortBy.split(",");
-
-            if (sortParams.length != 2) {
-                throw new IllegalArgumentException("Invalid sort paremeter. 'sortBy' parameter format is <fieldName>[,asc|,desc].");
-            }
-
-            String sortByField = sortParams[0];
-            String order = sortParams[1];
-
-            if (!sortByField.equals("resultdateofacceptance")){
-                throw new IllegalArgumentException("'" + sortByField + "' is not a sortable field.");
-            }
-
-            if (!checkOrder(order)) {
-                throw new IllegalArgumentException("'" + order + "' is not a valid ordering. Please use one of {ascending, descending}");
-            }
-
-            addSortParameter(sortByField, order, queryBuilder);
-        }
-    }
-
-    private static boolean checkOrder(String order) {
-        if (order.matches("ascending|descending")) {
-            return true;
-        }
-        return false;
-    }
-
-    private static void addSortParameter(String indexField, String order, StringBuilder queryBuilder) {
-        queryBuilder.append(" sortBy " + indexField + "/sort." + order);
-    }
-
-    private Response getCount(HttpServletRequest request, String query, String format, List<String> fieldQueries) {
-        String responseFormat = extractResponseFormat(format);
-
-        try {
-            SearchResult searchResult = ((SearchServiceImpl)searchService).newSearch(query, Locale.getDefault().toString(), null, fieldQueries, 0, 0, responseFormat, null, null, false);
-            return Response.status(Response.Status.OK).entity(APIResponseFormatter.createCountMeta(request, query, searchResult.getTotal(), responseFormat)).type(responseFormat).build();
-
-        } catch (SearchServiceException sse) {
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(APIResponseFormatter.compose500Message(responseFormat, "Fail to fetch count for query " + query + ".", sse.getMessage())).build();
-        }
-    }
-
-    private Response getResponseByEntityId(HttpServletRequest request, RequestResponseHandler.Entity entity, String entityId, String format, List<String> fieldQueries) {
-        String responseType = extractResponseFormat(format);
-        
-        try {
-            StringBuilder queryBuilder = new StringBuilder();
-            builtEntityIdQuery(queryBuilder, entity, entityId, fieldQueries);
-            String fullQuery = queryBuilder.toString();
-
-            if(fullQuery == null || fullQuery.isEmpty()) {
-                return Response.status(Response.Status.BAD_REQUEST).
-                        entity(APIResponseFormatter.compose400Message(format, "The 'query' parameter is required")).
-                        type(responseType).build();
-            }
-
-            SearchResult searchResult = ((SearchServiceImpl)searchService).newSearch(fullQuery, Locale.getDefault().toString(), null, fieldQueries, 0, 1, responseType, null, null, false);
-
-            if (searchResult.getSearchResults() == null || searchResult.getSearchResults().isEmpty() ||
-                    searchResult.getSearchResults().size() == 0 || searchResult.getSearchResults().get(0) == null) {
-                return Response.status(Response.Status.NOT_FOUND).entity(APIResponseFormatter.compose404Message(responseType, "404 - " + entity +" with id "
-                                + entityId + " not found.")).type(responseType).build();
-            }
-
-            return Response.status(Response.Status.OK).entity(APIResponseFormatter.createEntityResponse(request, entity, searchResult.getSearchResults().get(0).toString(), responseType)).type(responseType).build();
-
-        } catch (SearchServiceException sse) {
-            logger.error("Fail to fetch "+ entity + " with id " + entityId, sse);
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(APIResponseFormatter.compose500Message(responseType, "Fail to fetch " + entity + " with id " + entityId, sse.getMessage())).build();
-        }
-    }
-
-    private Response getResponseByEntity(String fullQuery, RequestResponseHandler.Entity entity, int offset, int limit, String format, HttpServletRequest request, boolean refine, List<String> refineFields, List<String> fieldQueries) {
-        long startTime = System.nanoTime();
-        Transformer transformer = extractTransformer(format, entity);
-        boolean special = isSpecialFormat(format);
-        boolean hasTitle = hasTitle(format);
-        String responseType = extractResponseFormat(format);
-
-        if(fullQuery == null || fullQuery.isEmpty()) {
-            return Response.status(Response.Status.BAD_REQUEST).
-                    entity(APIResponseFormatter.compose400Message(responseType, "The 'query' parameter is required")).
-                    type(responseType).build();
-        }
-
-        try {
-            SearchResult solrResults = ((SearchServiceImpl)searchService).newSearch(fullQuery, Locale.getDefault().toString(), refineFields, fieldQueries, offset, limit, responseType, transformer, null, false);
-            long estimatedTime = System.nanoTime() - startTime;
-            logger.debug("Publications search time " + estimatedTime/1000000 +  " milliseconds");
-            return Response.status(Response.Status.OK).entity(APIResponseFormatter.createEntitiesResponse(request, entity, fullQuery, fieldQueries, solrResults, refine, responseType, special, hasTitle)).type(responseType).build();
-
-        } catch (SearchServiceException sse) {
-            logger.error("Fail to get " + entity.getPlural() , sse);
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).
-                    entity(APIResponseFormatter.compose500Message(responseType, "Fail to fetch " + entity.getPlural(), sse.getMessage())).type(responseType).build();
-        }
-    }
-
-    private RequestResponseHandler.Entity extractEntity(String type) {
-
-        if (type == null) {
-            return RequestResponseHandler.Entity.NONE;
-        }
-
-        if (type.equalsIgnoreCase(RequestResponseHandler.Entity.PUBLICATION.getPlural())) {
-            return RequestResponseHandler.Entity.PUBLICATION;
-
-        } else if (type.equalsIgnoreCase(RequestResponseHandler.Entity.DATASET.getPlural())) {
-            return RequestResponseHandler.Entity.DATASET;
-
-        } else if (type.equalsIgnoreCase(RequestResponseHandler.Entity.SOFTWARE.getPlural())) {
-            return RequestResponseHandler.Entity.SOFTWARE;
-
-        } else if (type.equalsIgnoreCase(RequestResponseHandler.Entity.OTHER.getPlural())) {
-            return RequestResponseHandler.Entity.OTHER;
-
-        } else if (type.equalsIgnoreCase(RequestResponseHandler.Entity.PROJECT.getPlural())) {
-            return RequestResponseHandler.Entity.PROJECT;
-
-        } else if (type.equalsIgnoreCase(RequestResponseHandler.Entity.DATASOURCE.getPlural())) {
-            return RequestResponseHandler.Entity.DATASOURCE;
-
-        } else if (type.equalsIgnoreCase(RequestResponseHandler.Entity.PERSON.getPlural())) {
-            return RequestResponseHandler.Entity.PERSON;
-
-        } else if (type.equalsIgnoreCase(RequestResponseHandler.Entity.ORGANIZATION.getPlural())) {
-            return RequestResponseHandler.Entity.ORGANIZATION;
-        }
-
-        return RequestResponseHandler.Entity.NONE;
-    }
-
-
-    //This follows the newSearchWithoutFieldQueries comment. I wish to remove it!!! This was only made
-    // (quick and dirty - only the getResponseByEntity version with newSearchWithoutFieldQueries is used
-    // after a last time request for the portal to show all the publications and the deletedbyinference ones.
-    // I did not want to pass a parameter since I do not know if we are going to keep it. This is for a tech meeting showcase.
-    // If we want to keep this I need to redesign.
-    @GET
-    @Path("/api/deletedByInferencePublications/{publicationid}")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.requests.portal.publicationDuplicates", longTask = false)
-    //TODO remove
-    public Response fetchDeletedByInferencePublicationsById(@PathParam("publicationid") String publicationid,
-                                          @QueryParam("format") final String format,
-                                          @QueryParam("size") final int limit,
-                                          @QueryParam("fq") final List<String> fieldQueries,
-                                          @Context final HttpServletRequest request) {
-
-        return getDeletedByInferenceResponseByPid(request, RequestResponseHandler.Entity.PUBLICATION, publicationid, format, limit, fieldQueries);
-    }
-
-    @GET
-    @Path("/api/deletedByInferenceResults/{resultPid}")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.requests.portal.publicationDuplicates", longTask = false)
-    public Response fetchDeletedByInferenceEntitiesById(@PathParam("resultPid") String resultPid,
-                                                            @QueryParam("format") final String format,
-                                                            @QueryParam("size") final int limit,
-                                                            @QueryParam("fq") final List<String> fieldQueries,
-                                                            @Context final HttpServletRequest request) {
-
-        return getDeletedByInferenceResponseByPid(request, RequestResponseHandler.Entity.NONE, resultPid, format, limit, fieldQueries);
-    }
-
-
-    @GET
-    @Path("/api/deletedByInferenceOrganizations/{organizationPid}")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Timed(value = "http.requests.portal.organizationDuplicates", longTask = false)
-    public Response fetchDeletedByInferenceOrganizationById(@PathParam("organizationPid") String organizationPid,
-                                                     @QueryParam("format") final String format,
-                                                     @QueryParam("size") final int limit,
-                                                     @QueryParam("fq") final List<String> fieldQueries,
-                                                     @Context final HttpServletRequest request) {
-
-        return getDeletedByInferenceResponseByPid(request, RequestResponseHandler.Entity.ORGANIZATION, organizationPid, format, limit, fieldQueries);
-    }
-
-
-    //Please see comment above. I wish to remove it.
-    private Response getDeletedByInferenceResponseByPid(HttpServletRequest request, RequestResponseHandler.Entity entity, String resultPid, String format, int limit, List<String> fieldQueries) {
-        String responseType = extractResponseFormat(format);
-
-        try {
-            StringBuilder queryBuilder = new StringBuilder();
-            resultPidQuery(queryBuilder, entity, resultPid, fieldQueries);
-            String fullQuery = queryBuilder.toString();
-
-            if(fullQuery == null || fullQuery.isEmpty()) {
-                return Response.status(Response.Status.BAD_REQUEST).
-                        entity(APIResponseFormatter.compose400Message(format, "The 'query' parameter is required")).
-                        type(responseType).build();
-            }
-
-            SearchResult searchResults = ((SearchServiceImpl)searchService).newSearchWithoutFieldQueries(fullQuery, Locale.getDefault().toString(), null, fieldQueries, 0, limit, responseType, null, null, false);
-
-            if (searchResults.getSearchResults() == null || searchResults.getSearchResults().isEmpty() ||
-                    searchResults.getSearchResults().size() == 0 || searchResults.getSearchResults().get(0) == null) {
-                return Response.status(Response.Status.NOT_FOUND).entity(APIResponseFormatter.compose404Message(responseType, "404 - " + entity +" with id "
-                        + resultPid + " not found.")).type(responseType).build();
-            }
-
-
-            return Response.status(Response.Status.OK).entity(APIResponseFormatter.createEntitiesResponse(request, entity, fullQuery, null, searchResults, false, responseType, false, false)).type(responseType).build();
-
-        } catch (SearchServiceException sse) {
-            logger.error("Fail to fetch "+ entity + " with id " + resultPid, sse);
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(APIResponseFormatter.compose500Message(responseType, "Fail to fetch " + entity + " with id " + resultPid, sse.getMessage())).build();
-        }
-    }
-
-    /*
-    public static void main(String[] args) {
-        String json = " {\"result\":{\"xmlns:oaf\":\"http://namespace.openaire.eu/oaf\",\"xmlns:xsi\":\"http://www.w3.o" +
-                "rg/2001/XMLSchema-instance\",\"header\":{\"dri:dateOfCollection\":\"2016-05-20T03:34:07Z\",\"dri:dateOfTransformation\":\"\",\"counters\":{\"counter_dedup\":{\"value\":2},\"counter_doi\":{\"value\":2},\"counter_authorship\":{\"va" +
-                "lue\":1},\"counter_authorship_inferred\":{\"value\":1}},\"dri:objIdentifier\":\"dedup_wf_001::0f5604702b32f59d9789573113279e69\"},\"metadata\":{\"oaf:entity\":{\"oaf:result\":{\"datainfo\":{\"provenanceaction\":{\"schemename\"" +
-                ":\"dnet:provenanceActions\",\"classname\":\"sysimport:dedup\",\"schemeid\":\"dnet:provenanceActions\",\"classid\":\"sysimport:dedup\"},\"trust\":0.9,\"inferenceprovenance\":\"dedup-similarity-result\",\"deletedbyinference\":fal" +
-                "se,\"inferred\":true},\"rels\":{\"rel\":{\"to\":{\"content\":\"dedup_wf_001::884d8c367553a8de98ec90ece1b1be4a\",\"scheme\":\"dnet:person_result_relations\",\"class\":\"hasAuthor\",\"type\":\"person\"},\"provenanceaction\":\"sysimpor" +
-                "t:crosswalk:repository\",\"trust\":0.9,\"inferenceprovenance\":\"\",\"ranking\":1,\"inferred\":true,\"fullname\":\"Krafft, Alexander\"}},\"subject\":[{\"content\":\"Clinic for Obstetrics\",\"schemename\":\"dnet:result_subject\",\"c" +
-                "lassname\":\"keyword\",\"schemeid\":\"dnet:result_subject\",\"classid\":\"keyword\"},{\"content\":\"610 Medicine & health\",\"schemename\":\"dnet:result_subject\",\"classname\":\"keyword\",\"schemeid\":\"dnet:result_subject\",\"class" +
-                "id\":\"keyword\"},{\"content\":\"News\",\"schemename\":\"dnet:result_subject\",\"classname\":\"keyword\",\"schemeid\":\"dnet:result_subject\",\"classid\":\"keyword\"}],\"collectedfrom\":[{\"id\":\"opendoar____::0efe32849d230d7f53049d" +
-                "dc4a4b0c60\",\"name\":\"Zurich Open Repository and Archive\"},{\"id\":\"opendoar____::8b6dd7db9af49e67306feb59a8bdc52c\",\"name\":\"Europe PubMed Central\"}],\"children\":{\"result\":[{\"title\":{\"content\":\"Iron supplementat" +
-                "ion in pregnancy\",\"schemename\":\"dnet:dataCite_title\",\"classname\":\"main title\",\"schemeid\":\"dnet:dataCite_title\",\"classid\":\"main title\"},\"resulttype\":{\"schemename\":\"dnet:result_typologies\",\"classname\":\"publi" +
-                "cation\",\"schemeid\":\"dnet:result_typologies\",\"classid\":\"publication\"},\"dateofacceptance\":\"1981-09-01\",\"objidentifier\":\"od_______908::f27f9e68f0b9f510ebf572ba295344e1\"},{\"title\":{\"content\":\"Iron supplementat" +
-                "ion in pregnancy\",\"schemename\":\"dnet:dataCite_title\",\"classname\":\"main title\",\"schemeid\":\"dnet:dataCite_title\",\"classid\":\"main title\"},\"resulttype\":{\"schemename\":\"dnet:result_typologies\",\"classname\":\"publi" +
-                "cation\",\"schemeid\":\"dnet:result_typologies\",\"classid\":\"publication\"},\"dateofacceptance\":\"2013-01-01\",\"publisher\":\"BMJ Publishing Group\",\"objidentifier\":\"od_______885::0f5604702b32f59d9789573113279e69\"}],\"i" +
-                "nstance\":[{\"webresource\":{\"url\":\"http://europepmc.org/articles/PMC2306130\"},\"id\":\"opendoar____::8b6dd7db9af49e67306feb59a8bdc52c\",\"licence\":{\"schemename\":\"dnet:access_modes\",\"classname\":\"Open Access\",\"sche" +
-                "meid\":\"dnet:access_modes\",\"classid\":\"OPEN\"},\"hostedby\":{\"id\":\"opendoar____::8b6dd7db9af49e67306feb59a8bdc52c\",\"name\":\"Europe PubMed Central\"},\"instancetype\":{\"schemename\":\"dnet:publication_resource\",\"class" +
-                "name\":\"Article\",\"schemeid\":\"dnet:publication_resource\",\"classid\":\"0001\"}},{\"webresource\":{\"url\":\"http://www.zora.uzh.ch/87059/1/30_13_Krafft_2013bmj_f4399_full.pdf\"},\"id\":\"opendoar____::0efe32849d230d7f530" +
-                "49ddc4a4b0c60\",\"licence\":{\"schemename\":\"dnet:access_modes\",\"classname\":\"Open Access\",\"schemeid\":\"dnet:access_modes\",\"classid\":\"OPEN\"},\"hostedby\":{\"id\":\"opendoar____::0efe32849d230d7f53049ddc4a4b0c60\",\"name" +
-                "\":\"Zurich Open Repository and Archive\"},\"instancetype\":{\"schemename\":\"dnet:publication_resource\",\"classname\":\"Article\",\"schemeid\":\"dnet:publication_resource\",\"classid\":\"0001\"}}]},\"pid\":[{\"content\":\"10.5167" +
-                "/uzh-87059\",\"schemename\":\"dnet:pid_types\",\"classname\":\"doi\",\"schemeid\":\"dnet:pid_types\",\"classid\":\"doi\"},{\"content\":\"PMC2306130\",\"schemename\":\"dnet:pid_types\",\"classname\":\"pmc\",\"schemeid\":\"dnet:pid_types\"," +
-                "\"classid\":\"pmc\"},{\"content\":\"10.1136/bmj.f4399\",\"schemename\":\"dnet:pid_types\",\"classname\":\"doi\",\"schemeid\":\"dnet:pid_types\",\"classid\":\"doi\"}],\"resourcetype\":{\"schemename\":\"\",\"classname\":\"\",\"schemeid\":\"\",\"c" +
-                "lassid\":\"\"},\"format\":\"\",\"dateofacceptance\":\"2013-01-01\",\"embargoenddate\":\"\",\"version\":\"\",\"size\":\"\",\"publisher\":\"BMJ Publishing Group\",\"country\":{\"schemename\":\"\",\"classname\":\"\",\"schemeid\":\"\",\"classid\":\"\"},\"" +
-                "metadataversionnumber\":\"\",\"title\":{\"content\":\"Iron supplementation in pregnancy\",\"schemename\":\"dnet:dataCite_title\",\"classname\":\"main title\",\"schemeid\":\"dnet:dataCite_title\",\"classid\":\"main title\"},\"result" +
-                "type\":{\"schemename\":\"dnet:result_typologies\",\"classname\":\"publication\",\"schemeid\":\"dnet:result_typologies\",\"classid\":\"publication\"},\"source\":\"Krafft, Alexander (2013). Iron supplementation in pregnancy. Br" +
-                "itish Medical Journal, 347:f4399.\",\"contributor\":\"\",\"description\":\"\",\"originalId\":[\"oai:europepmc.org:1052305\",\"oai:www.zora.uzh.ch:87059\"],\"lastmetadataupdate\":\"\",\"relevantdate\":{\"schemename\":\"\",\"classnam" +
-                "e\":\"\",\"schemeid\":\"\",\"classid\":\"\"},\"device\":\"\",\"bestlicense\":{\"schemename\":\"dnet:access_modes\",\"classname\":\"Open Access\",\"schemeid\":\"dnet:access_modes\",\"classid\":\"OPEN\"},\"language\":{\"schemename\":\"dnet:langu" +
-                "ages\",\"classname\":\"English\",\"schemeid\":\"dnet:languages\",\"classid\":\"eng\"},\"storagedate\":\"\",\"fulltext\":\"\"},\"xsi:schemaLocation\":\"http://namespace.openaire.eu/oaf https://www.openaire.eu/schema/0.2/oaf-0.2.xs" +
-                "d\"}},\"xmlns:dri\":\"http://www.driver-repository.eu/namespace/dri\"}}";
-
-        String s = "{\"result\":{\"xmlns:oaf\":\"http://namespace.openaire.eu/oaf\",\"xmlns:xsi\":\"http://www.w3.org/2001" +
-                "/XMLSchema-instance\",\"header\":{\"dri:dateOfCollection\":\"2014-04-10T13:35:33Z\",\"dri:dateOfTransformation\":\"\",\"counters\":{\"counter_dedup\":{\"value\":2},\"counter_authorship\":{\"value\":1},\"counter_authorship_infer" +
-                "red\":{\"value\":1}},\"dri:objIdentifier\":\"dedup_wf_001::4d934888dee33a62dece6fa36192c710\"},\"metadata\":{\"oaf:entity\":{\"oaf:result\":{\"datainfo\":{\"provenanceaction\":{\"schemename\":\"dnet:provenanceActions\",\"classn" +
-                "ame\":\"sysimport:dedup\",\"schemeid\":\"dnet:provenanceActions\",\"classid\":\"sysimport:dedup\"},\"trust\":0.9,\"inferenceprovenance\":\"dedup-similarity-result\",\"deletedbyinference\":false,\"inferred\":true},\"rels\":{\"rel\"" +
-                ":{\"to\":{\"content\":\"od______1232::d4f9cea02c7762da24cd71ea0b9791de\",\"scheme\":\"dnet:person_result_relations\",\"class\":\"hasAuthor\",\"type\":\"person\"},\"provenanceaction\":\"sysimport:crosswalk:repository\",\"trust\":0" +
-                ".9,\"inferenceprovenance\":\"\",\"ranking\":1,\"inferred\":true,\"fullname\":\"Anonymous\"}},\"subject\":{\"content\":\"Señoríos-Legislación\",\"schemename\":\"dnet:result_subject\",\"classname\":\"keyword\",\"schemeid\":\"dnet:result" +
-                "_subject\",\"classid\":\"keyword\"},\"collectedfrom\":[{\"id\":\"opendoar____::e53a0a2978c28872a4505bdb51db06dc\",\"name\":\"Biblioteca Virtual del Patrimonio Bibliográfico (Virtual Library of Bibliographical Heritage)\"" +
-                "},{\"id\":\"opendoar____::7aee26c309def8c5a2a076eb250b8f36\",\"name\":\"Biblioteca Virtual de Aragón\"}],\"children\":{\"result\":[{\"title\":{\"content\":\"Discurso sobre los señoríos : necesidad y justicia del decreto de" +
-                " Cortes de 6 de Agosto de 1811 y ventaja que debe causar a la Nación\",\"schemename\":\"dnet:dataCite_title\",\"classname\":\"main title\",\"schemeid\":\"dnet:dataCite_title\",\"classid\":\"main title\"},\"resulttype\":{\"sch" +
-                "emename\":\"dnet:result_typologies\",\"classname\":\"publication\",\"schemeid\":\"dnet:result_typologies\",\"classid\":\"publication\"},\"dateofacceptance\":\"1820-01-01\",\"objidentifier\":\"od______2719::bc2326a31763719dc5ebd" +
-                "38f16a25404\"},{\"title\":{\"content\":\"Discurso sobre los señoríos : necesidad y justicia del decreto de Cortes de 6 de Agosto de 1811 y ventaja que debe causar a la Nación\",\"schemename\":\"dnet:dataCite_title\"," +
-                "\"classname\":\"main title\",\"schemeid\":\"dnet:dataCite_title\",\"classid\":\"main title\"},\"resulttype\":{\"schemename\":\"dnet:result_typologies\",\"classname\":\"publication\",\"schemeid\":\"dnet:result_typologies\",\"classid\"" +
-                ":\"publication\"},\"dateofacceptance\":\"1820-01-01\",\"objidentifier\":\"od______1232::4d934888dee33a62dece6fa36192c710\"}],\"instance\":[{\"webresource\":[{\"url\":\"http://bvpb.mcu.es/es/consulta/registro.cmd?id=403864\"" +
-                "},{\"url\":\"http://bvpb.mcu.es/es/catalogo_imagenes/grupo.cmd?path=2755\"}],\"id\":\"opendoar____::e53a0a2978c28872a4505bdb51db06dc\",\"licence\":{\"schemename\":\"dnet:access_modes\",\"classname\":\"Open Access\",\"schemei" +
-                "d\":\"dnet:access_modes\",\"classid\":\"OPEN\"},\"hostedby\":{\"id\":\"opendoar____::e53a0a2978c28872a4505bdb51db06dc\",\"name\":\"Biblioteca Virtual del Patrimonio Bibliográfico (Virtual Library of Bibliographical Herita" +
-                "ge)\"},\"instancetype\":{\"schemename\":\"dnet:publication_resource\",\"classname\":\"Book\",\"schemeid\":\"dnet:publication_resource\",\"classid\":\"0002\"}},{\"webresource\":{\"url\":\"http://bibliotecavirtual.aragon.es/bva/i18" +
-                "n/consulta/registro.cmd?id=2878\"},\"id\":\"opendoar____::7aee26c309def8c5a2a076eb250b8f36\",\"licence\":{\"schemename\":\"dnet:access_modes\",\"classname\":\"Open Access\",\"schemeid\":\"dnet:access_modes\",\"classid\":\"OPEN\"" +
-                "},\"hostedby\":{\"id\":\"opendoar____::7aee26c309def8c5a2a076eb250b8f36\",\"name\":\"Biblioteca Virtual de Aragón\"},\"instancetype\":{\"schemename\":\"dnet:publication_resource\",\"classname\":\"Book\",\"schemeid\":\"dnet:publi" +
-                "cation_resource\",\"classid\":\"0002\"}}]},\"pid\":{\"schemename\":\"\",\"classname\":\"\",\"schemeid\":\"\",\"classid\":\"\"},\"resourcetype\":{\"schemename\":\"\",\"classname\":\"\",\"schemeid\":\"\",\"classid\":\"\"},\"format\":\"\",\"dateofaccepta" +
-                "nce\":\"1820-01-01\",\"embargoenddate\":\"\",\"version\":\"\",\"size\":\"\",\"country\":{\"schemename\":\"\",\"classname\":\"\",\"schemeid\":\"\",\"classid\":\"\"},\"publisher\":\"\",\"metadataversionnumber\":\"\",\"title\":{\"content\":\"Discurso sob" +
-                "re los señoríos : necesidad y justicia del decreto de Cortes de 6 de Agosto de 1811 y ventaja que debe causar a la Nación\",\"schemename\":\"dnet:dataCite_title\",\"classname\":\"main title\",\"schemeid\":\"dnet:dataC" +
-                "ite_title\",\"classid\":\"main title\"},\"resulttype\":{\"schemename\":\"dnet:result_typologies\",\"classname\":\"publication\",\"schemeid\":\"dnet:result_typologies\",\"classid\":\"publication\"},\"source\":\"\",\"contributor\":\"Impr" +
-                "enta de Heras, imp.\",\"description\":\"\",\"originalId\":[\"oai:bvpb.mcu.es:403864\",\"oai:bibliotecavirtual.aragon.es:2878\"],\"lastmetadataupdate\":\"\",\"relevantdate\":{\"schemename\":\"\",\"classname\":\"\",\"schemeid\":\"\",\"cl" +
-                "assid\":\"\"},\"device\":\"\",\"bestlicense\":{\"schemename\":\"dnet:access_modes\",\"classname\":\"Open Access\",\"schemeid\":\"dnet:access_modes\",\"classid\":\"OPEN\"},\"language\":{\"schemename\":\"dnet:languages\",\"classname\":\"Span" +
-                "ish\",\"schemeid\":\"dnet:languages\",\"classid\":\"esl/spa\"},\"storagedate\":\"\",\"fulltext\":\"\"},\"xsi:schemaLocation\":\"http://namespace.openaire.eu/oaf https://www.openaire.eu/schema/0.2/oaf-0.2.xsd\"}},\"xmlns:dri\":\"h" +
-                "ttp://www.driver-repository.eu/namespace/dri\"}}\n";
-
-        JSONObject finalOject = new JSONObject();
-        finalOject.put("dri:objIdentifier", new JSONObject(json).getJSONObject("result").getJSONObject("header").getString("dri:objIdentifier"));
-        finalOject.put("content", new JSONObject(new JSONObject(json).getJSONObject("result").getJSONObject("metadata").getJSONObject("oaf:entity").getJSONObject("oaf:result"),
-                new String[]{"title", "description", "language", "bestlicense", "pid", "rels"}));
-
-        System.out.println(finalOject);
-
-        JSONObject jsonObject = new JSONObject(s).getJSONObject("result").getJSONObject("metadata").getJSONObject("oaf:entity").getJSONObject("oaf:result");
-        System.out.println("title --> " + jsonObject.getJSONObject("title").getString("content"));
-        System.out.println("pid --> " + jsonObject.getJSONArray("pid"));
-
-        JSONObject newJsonObject1 = new JSONObject(jsonObject, new String[]{"title", "description", "language", "bestlicense", "pid", "rels"});
-
-    }
-*/
-    /*
-
-    public static void main(String[] args) throws IOException, CQLParseException {
-        CqlTranslator translator = new CqlTranslatorImpl();
-        System.out.println(translator.toLucene("relfundinglevel0_id = ec__________::EC::FP7"));
-    }
-    */
-
-}
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/JSONResponseFormat.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/JSONResponseFormat.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/JSONResponseFormat.java	(nonexistent)
@@ -1,28 +0,0 @@
-package eu.dnetlib.data.search.web.api;
-
-/**
- * Created by kiatrop on 21/11/2016.
- */
-public class JSONResponseFormat {
-
-    public static final String error404Message = "{ \"status\" : \"error\", \"code\" : \"404\", \"message\" : \"%s\"}";
-    public static final String error400Message = "{ \"status\" : \"error\", \"code\" : \"400\", \"message\" : \"%s\"}";
-    public static final String error500Message = "{ \"status\" : \"fail\", \"code\" : \"500\", \"message\" : \"%s\", \"description\" : \"%s\" }";
-
-    public static final String countSearch = "{\"status\": \"success\", \"code\":\"200\", \"query\":\"%s\", \"total\":\"%s\", \"_links\": {%s}}";
-
-    public static final String singleValueResponse = "{\"meta\": %s, %s }";
-    public static final String response = "{\"meta\": %s, \"results\" : [%s] %s}";
-
-    public static final String metaSearch = "{\"status\": \"success\", \"code\":\"200\", \"query\":\"%s\", \"filters\":[%s], \"total\":\"%s\", \"page\":\"%s\", \"size\":\"%s\", \"_links\": {%s}}";
-    public static final String metaBasic = "{\"status\": \"success\", \"code\":\"200\", \"_links\": {%s}}";
-
-    public static final String _links = "\"first\": {\"href\":\"%s\"}, " +
-                                            " \"last\": {\"href\":\"%s\"}, " +
-                                            " \"previous\": {\"href\":\"%s\"}, " +
-                                            "  \"next\": {\"href\":\"%s\"}, " +
-                                            "  \"self\": {\"href\":\"%s\"}";
-    public static final String _selflink = "\"self\": {\"href\":\"%s\"}";
-
-
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/SearchRequestController.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/SearchRequestController.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/SearchRequestController.java	(nonexistent)
@@ -1,816 +0,0 @@
-package eu.dnetlib.data.search.web.api;
-
-import com.google.common.collect.Iterables;
-import eu.dnetlib.api.data.SearchService;
-import eu.dnetlib.api.data.SearchServiceException;
-import eu.dnetlib.data.search.utils.cql.ParameterQueryEnhancer;
-import eu.dnetlib.data.search.utils.vocabulary.VocabularyManager;
-import eu.dnetlib.domain.data.FormattedSearchResult;
-import io.micrometer.core.annotation.Timed;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
-import org.apache.commons.collections.ListUtils;
-import org.apache.commons.lang.IncompleteArgumentException;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.PrintWriter;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-@Controller
-@EnableAspectJAutoProxy
-@Timed
-public class SearchRequestController {
-
-    @Autowired
-    private SearchService searchService = null;
-    @Autowired
-    private VocabularyManager vocabularyManager = null;
-
-    @Resource
-    private String maxResults = null;
-
-    @Resource
-    private String maxSize = null;
-
-    @Autowired
-    private PrometheusMeterRegistry registry;
-
-    private static Logger logger = Logger.getLogger(SearchRequestController.class);
-
-    private static final String XML_CONTENT_TYPE = "application/xml;charset=UTF-8";
-    private static final String JSON_CONTENT_TYPE = "application/json;charset=UTF-8;";
-    private static final String CSV_CONTENT_TYPE = "text/csv;charset=UTF-8;";
-    private static final String TSV_CONTENT_TYPE = "text/tab-separated-values;charset=UTF-8;";
-    private static final String HTML_CONTENT_TYPE = "text/html;charset=UTF-8;";
-
-    private static final String PUBLICATION_BASIC_QUERY = "(oaftype exact result) and (resulttypeid exact publication)";
-    private static final String DATASET_BASIC_QUERY = "(oaftype exact result) and (resulttypeid exact dataset)";
-    private static final String SOFTWARE_BASIC_QUERY = "(oaftype exact result) and (resulttypeid exact software)";
-    private static final String OTHER_BASIC_QUERY = "(oaftype exact result) and (resulttypeid exact other)";
-    private static final String PROJECT_BASIC_QUERY = "(oaftype exact project)";
-
-    private static final List<String> GLOBAL_PARAMETERS = Arrays.asList("page", "size", "format", "sortBy");
-
-    private static final List<String> PUB_N_DATA_COMMON_PARAMETERS = Arrays.asList("author", "doi", "community", "FP7ProjectID", "FP7scientificArea",
-            "fromDateAccepted", "funder", "fundingStream", "hasECFunding", "hasProject", "hasWTFunding", "keywords",
-            "model", "OA", "openaireProjectID", "openaireProviderID", "projectID", "title", "toDateAccepted", "country");
-
-    private static final List<String> PUB_PARAMETERS = Arrays.asList("openairePublicationID");
-    private static final List<String> DATA_PARAMETERS = Arrays.asList("openaireDatasetID");
-    private static final List<String> SOFTWARE_PARAMETERS = Arrays.asList("openaireSoftwareID");
-    private static final List<String> OTHER_PARAMETERS = Arrays.asList("openaireOtherID");
-
-    private static final List<String> PUB_N_DATASET_MODELS = Arrays.asList("dc", "openaire", "sygma");
-    private static final List<String> PUB_N_DATASET_FORMATS = Arrays.asList("json", "rss", "xml", "csv", "tsv", "html");
-
-    private static final List<String> PROJECT_PARAMETERS = Arrays.asList("acronym", "callID", "endYear", "FP7scientificArea",
-            "funder", "fundingStream", "grantID", "hasECFunding", "hasWTFunding", "keywords", "name",
-            "participantAcronyms", "participantCountries", "startYear", "sc39", "openaireParticipantID", "openaireProjectID");
-    private static final List<String> PROJECT_FORMATS = Arrays.asList("xml", "json", "csv", "tsv", "html");
-
-    //TODO this is for joomla - to be removed soon
-    @RequestMapping(value = "/search", method = RequestMethod.GET)
-    @Timed(value = "search.joomla.requests", longTask = false)
-    public void search(HttpServletRequest request, HttpServletResponse response) {
-        PrintWriter writer = null;
-        FormattedSearchResult formattedSearchResult = null;
-
-        String action = readActionParameter(request);
-        String query = readQueryParameter(request);
-        String format = (request.getParameter("format") != null) ? request.getParameter("format") : "xml";
-        createResponseMeta(response, format);
-
-        String locale = request.getParameter("locale");
-
-        int page = 0;
-        int size = 0;
-        //TODO check paging
-        if (!action.equals("refine")) {
-            page = readParameter(request, "page", 1);
-            size = readParameter(request, "size", 10);
-        }
-
-        if (size > Integer.parseInt(maxSize)) {
-            throw new IllegalArgumentException("Size argument have exceeded the maximum allowed number.");
-        }
-
-        String sTransformer = request.getParameter("sTransformer");
-        String rTransformer = request.getParameter("rTransformer");
-        Collection<String> fields = readParameter(request, "fields");
-
-        checkTransformerParameters(action, sTransformer, rTransformer, fields);
-
-        try {
-            createResponseMeta(response, format);
-            writer = response.getWriter();
-
-            formattedSearchResult = searchService.searchNrefine(query,
-                    sTransformer, rTransformer, format, locale, page, size,
-                    fields);
-
-            writer.append(formattedSearchResult.getFormattedResult());
-
-        } catch (Exception e) {
-            logger.error("Fail to execute search.", e);
-            createXmlErrorPage(writer, e);
-
-        } finally {
-            if (writer != null) {
-                writer.close();
-            }
-        }
-    }
-
-    private void checkTransformerParameters(String action, String sTransformer, String rTransformer, Collection<String> fields) {
-        if (action.equals("search")) {
-            if (sTransformer == null) {
-                throw new IncompleteArgumentException("Undefined search transformer. Search request");
-            }
-
-        } else if (action.equals("refine")) {
-            if (rTransformer == null) {
-                throw new IncompleteArgumentException(
-                        "Undefined refine transformer. Refine request");
-            }
-
-            if (fields == null) {
-                throw new IncompleteArgumentException(
-                        "Undefined refine fields. Refine request");
-            }
-
-        } else if (action.equals("searchNrefine")) {
-
-            if (sTransformer == null) {
-                throw new IncompleteArgumentException(
-                        "Undefined search transformer. Search and Refine request");
-            }
-
-            if (rTransformer == null) {
-                throw new IncompleteArgumentException(
-                        "Undefined refine transformer. Search and Refine request");
-            }
-
-            if (fields == null) {
-                throw new IncompleteArgumentException(
-                        "Undefined refine fields. Search and Refine request");
-            }
-
-        } else {
-            throw new UnsupportedOperationException("The action " + action
-                    + " is not supported. Please try one of {search, refine, searchNrefine}.");
-        }
-    }
-
-    private String readQueryParameter(HttpServletRequest request) {
-        String query = request.getParameter("query");
-        if (query == null) {
-            throw new IncompleteArgumentException("Undefined query. Search request");
-        }
-        return query;
-    }
-
-    private String readActionParameter(HttpServletRequest request) {
-        String action = request.getParameter("action");
-        if (action == null) {
-            throw new UnsupportedOperationException("Undefined action.");
-        }
-        return action;
-    }
-
-
-    @RequestMapping(value="/search/openSearchDescriptor", method = RequestMethod.GET)
-    public String printOpenSearchDescriptor(ModelMap model) {
-        return "openSearchDescriptor";
-    }
-
-    @RequestMapping(value = "/api/publications", method = RequestMethod.GET, produces = {MediaType.APPLICATION_XML_VALUE,MediaType.APPLICATION_JSON_VALUE})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "api", "uri", "/api/publications"}, longTask = false)
-    public void searchPublications(HttpServletRequest request, HttpServletResponse response) throws Exception {
-
-        long time = System.currentTimeMillis();
-        checkParameters(ListUtils.union(PUB_N_DATA_COMMON_PARAMETERS, PUB_PARAMETERS),request.getParameterMap());
-
-        int page = readParameter(request, "page", 1);
-        int size = readParameter(request, "size", 10);
-        checkRequestSize(page, size);
-
-        String format = (request.getParameter("format") != null) ? request.getParameter("format") : "xml";
-        checkFormatParameter(PUB_N_DATASET_FORMATS, format);
-        createResponseMeta(response, format);
-
-        String locale = request.getParameter("locale");
-
-        String model = request.getParameter("model");
-        checkModelParameter(PUB_N_DATASET_MODELS, model);
-        String sTransformer = defineTransformer(model,format);
-
-        Collection<String> referrers = readParameter(request,"referrer");
-        String newFormat = defineFormatter(model, format, true, referrers);
-
-        StringBuilder queryBuilder = new StringBuilder();
-        queryBuilder.append(PUBLICATION_BASIC_QUERY);
-
-        ParameterQueryEnhancer.enhanceQueryWithFundingLevelParams(queryBuilder, request, vocabularyManager, isModelSygma(model));
-        ParameterQueryEnhancer.enhanceQueryWithOpenAIREIds(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithMetadataKeywords(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithFundingParams(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithCommunityParams(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithRelProjectParams(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithAccessRights(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithDate(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithDoi(queryBuilder, request);
-
-        ParameterQueryEnhancer.enhanceQueryWithResultsSortParameters(queryBuilder, request);
-        FormattedSearchResult formattedSearchResult = null;
-
-        try {
-            formattedSearchResult = searchService.search(queryBuilder.toString(),sTransformer, (newFormat!=null)?newFormat:format, locale, page, size);
-
-        } catch (Exception e) {
-            logger.error("Fail to execute search.", e);
-            throw new Exception("Fail to execute search", e);
-
-        }
-
-        PrintWriter writer = response.getWriter();
-        writer.append(formattedSearchResult.getFormattedResult());
-
-        writer.close();
-
-        time = System.currentTimeMillis() - time;
-        logger.debug("Answer old time " + time);
-    }
-
-
-    @RequestMapping(value = "/api/datasets", method = RequestMethod.GET, produces = {MediaType.APPLICATION_XML_VALUE,MediaType.APPLICATION_JSON_VALUE})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "api", "uri", "/api/datasets"}, longTask = false)
-    public void searchData(HttpServletRequest request, HttpServletResponse response) throws Exception {
-
-        checkParameters(ListUtils.union(PUB_N_DATA_COMMON_PARAMETERS, DATA_PARAMETERS),request.getParameterMap());
-
-        int page = readParameter(request, "page", 1);
-        int size = readParameter(request, "size", 10);
-        checkRequestSize(page, size);
-
-        String format = (request.getParameter("format") != null) ? request.getParameter("format") : "xml";
-        createResponseMeta(response, format);
-
-        checkFormatParameter(PUB_N_DATASET_FORMATS, format);
-
-        String model = request.getParameter("model");
-        checkModelParameter(PUB_N_DATASET_MODELS, model);
-        String sTransformer = defineTransformer(model,format);
-
-        Collection<String> referrers = readParameter(request,"referrer");
-        String newFormat = defineFormatter(model, format, false, referrers);
-
-        String locale = request.getParameter("locale");
-
-        StringBuilder queryBuilder = new StringBuilder();
-        queryBuilder.append(DATASET_BASIC_QUERY);
-
-        ParameterQueryEnhancer.enhanceQueryWithFundingLevelParams(queryBuilder, request, vocabularyManager, isModelSygma(model));
-        ParameterQueryEnhancer.enhanceQueryWithOpenAIREIds(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithMetadataKeywords(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithFundingParams(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithRelProjectParams(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithAccessRights(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithDate(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithDoi(queryBuilder, request);
-
-        ParameterQueryEnhancer.enhanceQueryWithResultsSortParameters(queryBuilder, request);
-
-        FormattedSearchResult formattedSearchResult =  null;
-        try {
-            formattedSearchResult = searchService.search(queryBuilder.toString(),sTransformer, (newFormat!=null)?newFormat:format, locale, page, size);
-
-        } catch (Exception e) {
-            logger.error("Fail to execute search.", e);
-            throw new Exception("Fail to execute search.", e);
-        }
-
-        PrintWriter writer = response.getWriter();
-        writer.append(formattedSearchResult.getFormattedResult());
-        writer.close();
-
-    }
-
-    @RequestMapping(value = "/api/software", method = RequestMethod.GET, produces = {MediaType.APPLICATION_XML_VALUE,MediaType.APPLICATION_JSON_VALUE})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "api", "uri", "/api/software"}, longTask = false)
-    public void searchSoftware(HttpServletRequest request, HttpServletResponse response) throws Exception {
-
-        checkParameters(ListUtils.union(PUB_N_DATA_COMMON_PARAMETERS, SOFTWARE_PARAMETERS),request.getParameterMap());
-
-        int page = readParameter(request, "page", 1);
-        int size = readParameter(request, "size", 10);
-        checkRequestSize(page, size);
-
-        String format = (request.getParameter("format") != null) ? request.getParameter("format") : "xml";
-        createResponseMeta(response, format);
-
-        checkFormatParameter(PUB_N_DATASET_FORMATS, format);
-
-        String model = request.getParameter("model");
-        checkModelParameter(PUB_N_DATASET_MODELS, model);
-        String sTransformer = defineTransformer(model,format);
-
-        Collection<String> referrers = readParameter(request,"referrer");
-        String newFormat = defineFormatter(model, format, false, referrers);
-
-        String locale = request.getParameter("locale");
-
-        StringBuilder queryBuilder = new StringBuilder();
-        queryBuilder.append(SOFTWARE_BASIC_QUERY);
-
-        ParameterQueryEnhancer.enhanceQueryWithFundingLevelParams(queryBuilder, request, vocabularyManager, isModelSygma(model));
-        ParameterQueryEnhancer.enhanceQueryWithOpenAIREIds(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithMetadataKeywords(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithFundingParams(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithCommunityParams(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithRelProjectParams(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithAccessRights(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithDate(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithDoi(queryBuilder, request);
-
-        ParameterQueryEnhancer.enhanceQueryWithResultsSortParameters(queryBuilder, request);
-
-        FormattedSearchResult formattedSearchResult = null;
-
-        try {
-            formattedSearchResult =  searchService.search(queryBuilder.toString(),sTransformer, (newFormat!=null)?newFormat:format, locale, page, size);
-
-        } catch (Exception e) {
-            logger.error("Fail to execute search.", e);
-            throw new Exception("Fail to execute search", e);
-        }
-
-        PrintWriter writer = response.getWriter();
-        writer.append(formattedSearchResult.getFormattedResult());
-
-    }
-
-    @RequestMapping(value = "/api/other", method = RequestMethod.GET, produces = {MediaType.APPLICATION_XML_VALUE,MediaType.APPLICATION_JSON_VALUE})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "api", "uri", "/api/other"}, longTask = false)
-    public void searchOther(HttpServletRequest request, HttpServletResponse response) throws Exception {
-
-        checkParameters(ListUtils.union(PUB_N_DATA_COMMON_PARAMETERS, OTHER_PARAMETERS),request.getParameterMap());
-
-        int page = readParameter(request, "page", 1);
-        int size = readParameter(request, "size", 10);
-        checkRequestSize(page, size);
-
-        String format = (request.getParameter("format") != null) ? request.getParameter("format") : "xml";
-        createResponseMeta(response, format);
-
-        checkFormatParameter(PUB_N_DATASET_FORMATS, format);
-
-        String model = request.getParameter("model");
-        checkModelParameter(PUB_N_DATASET_MODELS, model);
-        String sTransformer = defineTransformer(model,format);
-
-        Collection<String> referrers = readParameter(request,"referrer");
-        String newFormat = defineFormatter(model, format, false, referrers);
-
-        String locale = request.getParameter("locale");
-
-        StringBuilder queryBuilder = new StringBuilder();
-        queryBuilder.append(OTHER_BASIC_QUERY);
-
-        ParameterQueryEnhancer.enhanceQueryWithFundingLevelParams(queryBuilder, request, vocabularyManager, isModelSygma(model));
-        ParameterQueryEnhancer.enhanceQueryWithOpenAIREIds(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithMetadataKeywords(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithFundingParams(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithCommunityParams(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithRelProjectParams(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithAccessRights(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithDate(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithDoi(queryBuilder, request);
-
-        ParameterQueryEnhancer.enhanceQueryWithResultsSortParameters(queryBuilder, request);
-
-        FormattedSearchResult formattedSearchResult = null;
-
-        //long start = System.currentTimeMillis();
-        try {
-            //Timer.Sample sample = Timer.start(metrics.getRegistry());
-            formattedSearchResult =  searchService.search(queryBuilder.toString(),sTransformer, (newFormat!=null)?newFormat:format, locale, page, size);
-
-        } catch (Exception e) {
-            logger.error("Fail to execute search.", e);
-            throw new Exception("Fail to execute search", e);
-        }
-
-        PrintWriter writer = response.getWriter();
-        writer.append(formattedSearchResult.getFormattedResult());
-    }
-
-    @RequestMapping(value = "/api/projects", method = RequestMethod.GET, produces = {MediaType.APPLICATION_XML_VALUE,MediaType.APPLICATION_JSON_VALUE})
-    @Timed(value = "http.server.request.duration", extraTags = {"referer", "api", "uri", "/api/projects"}, longTask = false)
-    public void searchProjects(HttpServletRequest request, HttpServletResponse response) throws Exception {
-
-        checkParameters(PROJECT_PARAMETERS, request.getParameterMap());
-
-        int page = readParameter(request, "page", 1);
-        int size = readParameter(request, "size", 10);
-        checkRequestSize(page, size);
-
-        StringBuilder queryBuilder = new StringBuilder();
-        queryBuilder.append(PROJECT_BASIC_QUERY);
-        String locale = request.getParameter("locale");
-
-        String format =  (request.getParameter("format") != null) ? request.getParameter("format") : "xml";
-        checkFormatParameter(PROJECT_FORMATS, format);
-        createResponseMeta(response, format);
-
-        format = finalFormat(format);
-
-        String sTransformer = request.getParameter("sTransformer");
-
-        ParameterQueryEnhancer.enhanceProjectQueryWithOpenAIREIds(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithProjectMetadataKeywords(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithProjectFundingParams(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceProjectQueryWithFundingLevelParams(queryBuilder, request, vocabularyManager);
-        ParameterQueryEnhancer.enhanceQueryWithParticipantsInfoParams(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithYearParams(queryBuilder, request);
-        ParameterQueryEnhancer.enhanceQueryWithSC39Params(queryBuilder, request);
-
-        ParameterQueryEnhancer.enhanceQueryWithProjectSortParameters(queryBuilder, request);
-
-        FormattedSearchResult formattedSearchResult = null;
-        try {
-            formattedSearchResult = searchService.search(queryBuilder.toString(),sTransformer, format, locale, page, size);
-
-        } catch (SearchServiceException e) {
-            throw new Exception("Fail to execute search", e);
-        }
-
-        PrintWriter writer = response.getWriter();
-        writer.append(formattedSearchResult.getFormattedResult());
-        writer.close();
-    }
-
-
-    @ExceptionHandler(IllegalArgumentException.class)
-    public @ResponseBody ResponseEntity<Error> invalidInput(HttpServletRequest request, HttpServletResponse httpServletResponse, Exception ex) {
-        Error response = new Error();
-        response.setStatus("error");
-        response.setCode("400");
-        response.setMessage("400 - Illegal argument exception.");
-        response.setException(ex.getMessage());
-
-        String format = (request.getParameter("format") == null)? "xml": request.getParameter("format").toLowerCase();
-
-        registry.counter("http.status.400", "400", "uri").increment();
-
-        return new ResponseEntity<Error>(response, HttpStatus.BAD_REQUEST);
-    }
-
-    private String finalFormat(String format) {
-        if (format.equals("tsv")){
-            return "project_tsv";
-
-        } else if (format.equals("csv")) {
-            return "project_csv";
-
-        } else if (format.equals("html")) {
-            return "project_html";
-        }
-
-        return format;
-    }
-
-    private String finalFormat(String format, String referrer) {
-        if (referrer == null || referrer.isEmpty() || !referrer.equals("joomla")) {
-            return finalFormat(format);
-        }
-
-        if (format.equals("tsv")){
-            return "publication_tsv_notitle";
-
-        } else if (format.equals("csv")) {
-            return "publication_csv_notitle";
-
-        }
-
-        return format;
-    }
-
-    /** TODO: check if needed
-     * Based on the given model the transformer to be used is defined
-     * @param model
-     * @return
-
-    private String defineTransformer(String model) {
-    if (model!=null && !model.trim().isEmpty()) {
-    if (model.equals("openaire")) {
-    return null;
-
-    } else if (model.equals("sygma")) {
-    return "results_openaire";
-    }
-    else if (model.equals("dc")) {
-    return "dc";
-    }
-
-    throw new IllegalArgumentException("model '" + model + "' is not supported.");
-
-    } else {
-    return null;
-    }
-    }*/
-
-    //TODO: check if needed
-    private String defineTransformer(String model, String format) {
-        if (model != null && !model.trim().isEmpty() && format != null && (format.equals("json")||format.equals("xml"))) {
-            if (model.equals("openaire")) {
-                return null;
-
-            } else if (model.equals("sygma")) {
-                return "results_openaire";
-            }
-            else if (model.equals("dc")) {
-                return "dc";
-            }
-
-            throw new IllegalArgumentException("model '" + model + "' is not supported.");
-
-        } else if (format != null && !format.trim().isEmpty()) {
-            if (format.equals("rss") || format.equals("csv") || format.equals("tsv") || format.equals("html")) {
-                return "results_openaire";
-            }
-        }
-        return null;
-
-    }
-
-    private String defineFormatter(String model, String format, boolean isPublications, Collection<String> referrers) {
-        if( model != null && !model.trim().isEmpty() ) {
-            if (model.equals("sygma")) {
-
-                if (isPublications) {
-                    return "sygma_publication";
-                }
-                return "sygma_dataset";
-            }
-        } else {
-            if (referrers != null && !referrers.isEmpty() && Iterables.get(referrers, 0) != null && !Iterables.get(referrers, 0).isEmpty()) {
-                return finalFormat(format, Iterables.get(referrers, 0));
-            } else {
-                format = finalFormat(format);
-            }
-        }
-
-        return null;
-    }
-
-    @Deprecated
-    private void createXmlErrorPage(PrintWriter writer, Exception e) {
-        writer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-        writer.append("<error>");
-        writer.append("<exception>")
-                .append(StringEscapeUtils.escapeXml(e.getClass().getName()))
-                .append("</exception>");
-        if (e.getMessage() != null) {
-            writer.append("<message>")
-                    .append(StringEscapeUtils.escapeXml(e.getMessage()))
-                    .append("</message>");
-        }
-        if (e.getCause() != null) {
-            writer.append("<cause>")
-                    .append(StringEscapeUtils.escapeXml(e.getCause()
-                            .toString())).append("</cause>");
-        }
-
-        StackTraceElement[] trace = e.getStackTrace();
-        writer.append("<trace>");
-        for (int i = 0; i < trace.length; i++) {
-            writer.append(StringEscapeUtils.escapeXml(trace[i].toString()))
-                    .append("\n");
-        }
-        writer.append("</trace>");
-
-        writer.append("</error>");
-    }
-
-    // Reading parameters from url and adding default values
-    public int readParameter(HttpServletRequest request, String parameterName, int defaultValue) {
-        String param = request.getParameter(parameterName);
-        return (param != null && !param.isEmpty()) ? Integer.parseInt(param) : defaultValue;
-    }
-
-    private Collection<String> readParameter(HttpServletRequest request, String parameterName) {
-        Collection<String> fields = null;
-        String[] paramfields = request.getParameterValues(parameterName);
-        if (paramfields != null) {
-            fields = new ArrayList<String>();
-            for (int i = 0; i < paramfields.length; i++) {
-                fields.add(paramfields[i]);
-            }
-        }
-        return fields;
-    }
-
-    /**
-     * Checks if the requested result size exceeds the maximum allowed numbers of returned results
-     * @param page the page parameter
-     * @param size the size parameter
-     */
-    private void checkRequestSize(int page, int size) {
-        int total = page*size;
-        if (total > Integer.parseInt(maxResults)) {
-            throw new IllegalArgumentException("Size and page arguments have exceeded the maximum number of returned results.");
-        }
-    }
-
-    private String defineContentType(String format) {
-        if (format != null) {
-            if (format.equalsIgnoreCase("xml")) {
-                return XML_CONTENT_TYPE;
-            } else if (format.equalsIgnoreCase("json")) {
-                return JSON_CONTENT_TYPE;
-
-            } else if (format.equalsIgnoreCase("csv")) {
-                return CSV_CONTENT_TYPE;
-
-            } else if (format.equalsIgnoreCase("tsv")) {
-                return TSV_CONTENT_TYPE;
-
-            } else if (format.equalsIgnoreCase("html")){
-                return HTML_CONTENT_TYPE;
-            }
-        }
-
-        return XML_CONTENT_TYPE;
-    }
-    /**
-     * Checks if the parameters given are allowed. The given parameters are checked against the allowed parameter
-     * and the GLOBAL_PARAMETERS.
-     * @param allowedParameters the allowed parameters
-     * @param currentParameters the given parameters
-     */
-    private void checkParameters(List<String> allowedParameters, Map<String, String[]> currentParameters){
-        if(currentParameters != null) {
-            for (String parameter : currentParameters.keySet()) {
-                if (!allowedParameters.contains(parameter) && !GLOBAL_PARAMETERS.contains(parameter) && !parameter.equals("referrer")) {
-                    throw new IllegalArgumentException("Parameter " + parameter + " is not supported. The supported parameters are: " +
-                            allowedParameters.toString().replace("[","").replace("]", ", ") + GLOBAL_PARAMETERS.toString().substring(1,GLOBAL_PARAMETERS.toString().length()-1));
-                }
-            }
-        }
-    }
-
-    private void checkFormatParameter(List<String> allowedFormats, String requestedFormat) {
-        if (requestedFormat!= null && !allowedFormats.contains(requestedFormat)) {
-            throw new IllegalArgumentException("The requested format \'"+ requestedFormat +"\' is not supported. The supported formats are: " + allowedFormats);
-        }
-    }
-
-    private static void checkModelParameter(List<String> allowedModels, String requestedModel) {
-        if (requestedModel!= null && !allowedModels.contains(requestedModel)) {
-            throw new IllegalArgumentException("The requested model \'"+ allowedModels +"\' is not supported. The supported formats are: " + allowedModels);
-        }
-    }
-
-    private static boolean isModelSygma(String model) {
-        if (model == null || model.isEmpty()) { return false; }
-
-        if (!model.isEmpty() && !model.equals("sygma")) {
-            return  false;
-        }
-
-        return true;
-    }
-
-    private void createResponseMeta( HttpServletResponse response, String format) {
-        response.setContentType(defineContentType(format));
-        response.setCharacterEncoding("UTF-8");
-
-        if (!format.equals("xml") || !format.equals("json")) {
-
-            SimpleDateFormat sdf = new SimpleDateFormat("ddMMyyyy");
-            String date = sdf.format(new Date());
-
-            if (format.equals("csv")) {
-                response.setHeader("Content-Disposition", "filename="+date+".csv");
-
-            } else if (format.equals("csv")) {
-                response.setHeader("Content-Disposition", "filename="+date+".tsv");
-
-            } else if (format.equals("html")) {
-                response.setHeader("Content-Disposition", "filename="+date+".html");
-            }
-        }
-    }
-
-
-    /* TODO: enable if we decide to use ACCEPT Header as a priority to format parameter
-    private String getFormat(HttpServletRequest request) {
-        if (request.getParameter("format") == null && request.getHeader("Accept")!=null) {
-            if (request.getHeader("Accept").equals(MediaType.APPLICATION_XML_VALUE) ||
-                    request.getHeader("Accept").contains(MediaType.APPLICATION_XML_VALUE)){
-                return "xml";
-            }
-
-            if (request.getHeader("Accept").equals(MediaType.APPLICATION_JSON_VALUE)){
-                return "json";
-            }
-        }
-
-        if (request.getParameter("format") == null && (request.getHeader("Accept")== null ||
-                request.getHeader("Accept").equals(MediaType.ALL_VALUE))) {
-            return "xml";
-        }
-
-        return request.getParameter("format");
-    } */
-
-    /*public void test(HttpServletRequest request, HttpServletResponse response) throws IOException, SolrServerException {
-
-        long time = System.currentTimeMillis();
-
-        CloudSolrServer solrClient = new CloudSolrServer("openaire-solr-beta.vls.icm.edu.pl:9983");
-        solrClient.setDefaultCollection("DMF-index-openaire");
-
-        response.setContentType("text/html");
-        ServletOutputStream out=response.getOutputStream();
-
-        NamedList<String> queryOpts = new NamedList<String>();
-
-        //q=*:*&start=0&rows=10&cursorMark=*&sort=dateofcollection asc
-        try {
-            queryOpts.add("q", new CqlTranslatorImpl().getTranslatedQuery("(oaftype exact result) and (resulttypeid exact publication) and (relfundershortname exact \"nhmrc_______::NHMRC||National Health and Medical Research Council (NHMRC)||NHMRC\")").asLucene());
-
-        } catch (CQLParseException e) {
-            logger.error(e);
-        }
-        queryOpts.add("start", "0");
-        queryOpts.add("rows", "500");
-        queryOpts.add("fl", "__result");
-        queryOpts.add("shards.tolerant","true");
-        queryOpts.add("cursorMark", "*");
-        queryOpts.add("sort", "__indexrecordidentifier asc");
-
-
-        //queryOpts.add("q", new CqlTranslatorImpl().getTranslatedQuery("oaftype exact project").asLucene());
-        NamedList<String> extraOpts = new NamedList<String>();
-
-        QueryResponse resp = null;
-
-        String cursorMark = "*";
-        String nextCursorMark = "";
-
-        //QueryResponse resp = solrClient.query(SolrParams.toSolrParams(queryOpts));
-
-        int curs = 0;
-        while (!cursorMark.equals(nextCursorMark)) {
-            logger.debug("QUERY OPTS: " + queryOpts.get("cursorMark"));
-            resp = solrClient.query(SolrParams.toSolrParams(queryOpts));
-            logger.debug("TOTAL number " + resp.getResults().getNumFound());
-            logger.debug(resp.getNextCursorMark());
-
-            System.out.println("BEGIN");
-            System.out.println("cursor " + cursorMark);
-            System.out.println("next cursor " + nextCursorMark);
-
-            cursorMark = nextCursorMark;
-            nextCursorMark = resp.getNextCursorMark();
-
-            for (int i = 0; i < resp.getResults().size(); i++) {
-                String result = ((ArrayList<String>) resp.getResults().get(i).get("__result")).get(0);
-                out.write(result.getBytes());
-                out.flush();
-            }
-
-            System.out.println("END");
-            System.out.println("cursor " + cursorMark);
-            System.out.println("next cursor " + nextCursorMark);
-            queryOpts.remove("cursorMark");
-            queryOpts.add("cursorMark", nextCursorMark);
-
-            System.out.println("CURS " + curs);
-            curs ++;
-
-        }
-
-        out.close();
-
-        time = System.currentTimeMillis() - time;
-        System.out.println("Answer time " + time);
-    }*/
-
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/ExceptionController.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/ExceptionController.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/ExceptionController.java	(nonexistent)
@@ -1,32 +0,0 @@
-package eu.dnetlib.data.search.web.api;
-
-
-import io.micrometer.prometheus.PrometheusMeterRegistry;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
-
-@EnableWebMvc
-@ControllerAdvice(value = "eu.dnetlib.data.search.web.api", assignableTypes = SearchRequestController.class)
-public class ExceptionController extends ResponseEntityExceptionHandler{
-
-    @Autowired
-    PrometheusMeterRegistry registry;
-
-    @ExceptionHandler(Exception.class)
-    public ResponseEntity<Error> invalidInput(Exception ex) {
-        Error response = new Error();
-        response.setStatus("error");
-        response.setCode("500");
-        response.setMessage("500 - Internal server error.");
-        response.setException(ex.getMessage());
-
-
-        registry.counter("http.status.500", "500", "uri").increment();
-        return new ResponseEntity<Error>(response, HttpStatus.CONFLICT);
-    }
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/CSVResponseFormat.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/CSVResponseFormat.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/CSVResponseFormat.java	(nonexistent)
@@ -1,48 +0,0 @@
-package eu.dnetlib.data.search.web.api;
-
-import eu.dnetlib.data.search.web.utils.RequestResponseHandler;
-
-/**
- * Created by kiatrop on 20/12/2016.
- */
-public class CSVResponseFormat {
-
-    public static final String organization = "Name,Projects,Country\n";
-    public static final String datasource = "Name,Type,Compatibility,OAI-PMH,website\n";
-    public static final String person = "Fullname\n";
-    public static final String project = "Title,Funder,Start Date,End Date,Participants\n";
-    public static final String result = "Title,Authors,Publication Year,DOI,Funder|Project Name (GA Number),Access\n";
-
-    //TODO SPECIAL
-    public static final String result_special = "Title,Authors,Publication Year,DOI,Download from,Type,Journal,Funder,Project Name (GA Number),Access\n";
-
-
-    public static final String response = "%s%s";
-
-    public static String appendTitle(RequestResponseHandler.Entity entity, boolean special) {
-        if(entity.equals(RequestResponseHandler.Entity.ORGANIZATION)) {
-            return  organization;
-
-        } else if (entity.equals(RequestResponseHandler.Entity.DATASOURCE)) {
-            return  datasource;
-
-        } else if (entity.equals(RequestResponseHandler.Entity.PERSON)) {
-            return  person;
-
-        } else if (entity.equals(RequestResponseHandler.Entity.PROJECT)) {
-            return project;
-
-        } else if (entity.equals(RequestResponseHandler.Entity.PUBLICATION) || entity.equals(RequestResponseHandler.Entity.DATASET)) {
-            if (special) {
-                return result_special;
-            }
-
-            return result;
-        }
-
-        return "";
-    }
-
-
-
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/TSVResponseFormat.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/TSVResponseFormat.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/TSVResponseFormat.java	(nonexistent)
@@ -1,9 +0,0 @@
-package eu.dnetlib.data.search.web.api;
-
-/**
- * Created by kiatrop on 20/12/2016.
- */
-public class TSVResponseFormat {
-    public static final String organization = "Name\tProjects\tCountry\n";
-    public static final String response = "%s%s";
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/MicrometerPublisher.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/MicrometerPublisher.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/MicrometerPublisher.java	(nonexistent)
@@ -1,29 +0,0 @@
-package eu.dnetlib.data.search.web.api;
-
-import io.micrometer.prometheus.PrometheusMeterRegistry;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-@Controller
-@ComponentScan
-@Component
-public class MicrometerPublisher {
-
-    @Autowired
-    PrometheusMeterRegistry registry;
-
-    @RequestMapping(method = RequestMethod.GET, value = "/metrics", produces = {MediaType.TEXT_PLAIN_VALUE})
-    @ResponseBody
-    public String getMetrics(HttpServletRequest request, HttpServletResponse response) throws Exception {
-        return  registry.scrape();
-    }
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/XMLResponseFormat.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/XMLResponseFormat.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/XMLResponseFormat.java	(nonexistent)
@@ -1,30 +0,0 @@
-package eu.dnetlib.data.search.web.api;
-
-/**
- * Created by kiatrop on 16/11/2016.
- */
-public class XMLResponseFormat {
-
-    public static final String error404Message = "<response><status>error</status><code>404</code><message>%s</message></response>";
-    public static final String error400Message = "<response><status>error</status><code>400</code><message>%s</message></response>";
-    public static final String error500Message = "<response><status>fail</status><code>500</code><message>%s</message><description>%s</description></response>";
-
-    public static final String countSearch = "<response><status>success</status><code>200</code><query>%s</query><total>%s</total><links>%s</links></response>";
-
-    public static final String singleValueResponse = "<response><meta>%s</meta>%s</response>";
-    public static final String response = "<response><meta>%s</meta><results>%s</results>%s</response>";
-
-    public static final String metaSearch = "<status>success</status><code>200</code><query>%s</query><filters>%s</filters><total>%s</total><page>%s</page><size>%s</size><links>%s</links>";
-    public static final String metaBasic = "<status>success</status><code>200</code><links>%s</links>";
-
-    public static final String _links = "<first>%s</first>" +
-                                        "<last>%s</last>" +
-                                        "<previous>%s</previous>" +
-                                        "<next>%s</next>" +
-                                        "<self>%s</self>";
-
-    public static final String _selflink = "<self>%s</self>";
-
-
-}
-
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/Error.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/Error.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/Error.java	(nonexistent)
@@ -1,55 +0,0 @@
-package eu.dnetlib.data.search.web.api;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
-public class Error {
-
-    private String status;
-    private String code;
-    private String message;
-    private String exception;
-    private String trace;
-
-    public Error() { }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public String getException() {
-        return exception;
-    }
-
-    public void setException(String exception) {
-        this.exception = exception;
-    }
-
-    public String getTrace() {
-        return trace;
-    }
-
-    public void setTrace(String trace) {
-        this.trace = trace;
-    }
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/HTMLResponseFormat.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/HTMLResponseFormat.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/HTMLResponseFormat.java	(nonexistent)
@@ -1,21 +0,0 @@
-package eu.dnetlib.data.search.web.api;
-
-/**
- * Created by kiatrop on 16/1/2017.
- */
-public class HTMLResponseFormat {
-    public static final String response = "<table>" +
-            "<thead><tr>" +
-            " <th>Title</th>" +
-            "<th>Authors</th>" +
-            "<th>Publication Year</th>" +
-            "<th>DOI</th>\n" +
-            "<th>Permanent Identifier</th>" +
-            "<th>Publication type</th>" +
-            "<th>Journal</th>" +
-            "<th>Project Name (GA Number)</th>" +
-            "<th>Access Mode</th>" +
-            "</tr>" +
-            "</thead>" +
-            "<tbody>%s</tbody></table>";
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/APIResponseFormatter.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/APIResponseFormatter.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/api/APIResponseFormatter.java	(nonexistent)
@@ -1,269 +0,0 @@
-package eu.dnetlib.data.search.web.api;
-
-import eu.dnetlib.data.search.web.utils.RequestResponseHandler;
-import eu.dnetlib.domain.data.SearchResult;
-import org.apache.commons.lang3.StringEscapeUtils;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.MediaType;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Created by kiatrop on 21/11/2016.
- */
-public class APIResponseFormatter {
-
-    //private static final Logger logger = Logger.getLogger(APIResponseFormatter.class);
-
-    public static String compose404Message(String type, String message) {
-        if(type.equals(MediaType.APPLICATION_JSON)) {
-           return String.format(JSONResponseFormat.error404Message, StringEscapeUtils.escapeJson(message));
-        }
-        return String.format(XMLResponseFormat.error404Message, StringEscapeUtils.escapeXml10(message));
-    }
-
-    public static String compose400Message(String type, String message) {
-         if(type.equals(MediaType.APPLICATION_JSON)) {
-            return String.format(JSONResponseFormat.error400Message, StringEscapeUtils.escapeJson(message));
-        }
-        return String.format(XMLResponseFormat.error400Message, StringEscapeUtils.escapeXml10(message));
-    }
-
-    public static String compose500Message(String type, String message, String description) {
-        if(type.equals(MediaType.APPLICATION_JSON)) {
-            return String.format(JSONResponseFormat.error500Message, StringEscapeUtils.escapeJson(message), StringEscapeUtils.escapeJson(description));
-        }
-        return String.format(XMLResponseFormat.error500Message, StringEscapeUtils.escapeXml10(message), StringEscapeUtils.escapeXml10(description));
-    }
-
-    public static String createCountMeta(HttpServletRequest request, String query, int total, String type) {
-        String selfPageUrl = pageUrlCreation(request);
-
-        if  (type.equals(MediaType.APPLICATION_JSON)) {
-            return String.format(JSONResponseFormat.countSearch, StringEscapeUtils.escapeJson(query), total, formatSelfPaging(type, selfPageUrl));
-        }
-
-        return String.format(XMLResponseFormat.countSearch, StringEscapeUtils.escapeXml10(query), total, formatSelfPaging(type, selfPageUrl));
-    }
-
-    public static String createEntityResponse(HttpServletRequest request, RequestResponseHandler.Entity entityType, String entity, String type) {
-        if (type.equals(MediaType.APPLICATION_JSON)) {
-            String cleanEntity = null;
-            if (entity != null && !entity.isEmpty()) {
-                cleanEntity = entity.substring(1, entity.length() - 1);
-            } else {
-                cleanEntity = "\"result\":{}";
-            }
-            return String.format(JSONResponseFormat.singleValueResponse, createMetaBasic(request, type), cleanEntity);
-        }
-        return String.format(XMLResponseFormat.singleValueResponse, createMetaBasic(request, type), entity);
-    }
-
-    public static String createEntitiesResponse(HttpServletRequest request, RequestResponseHandler.Entity entityType, String query, List<String> filters, SearchResult searchResult, boolean refine, String type, boolean special, boolean hasTitle) {
-
-        if  (type.equals(MediaType.APPLICATION_JSON)) {
-                return String.format(JSONResponseFormat.response, createMeta(request, type, query, filters, searchResult.getTotal(), searchResult.getPage(), searchResult.getSize()), formatSearchResults(type, searchResult.getSearchResults()), formatRefineResults(type, searchResult.getBrowseResults()));
-        }
-
-        if(type.equals("text/csv")) {
-            if (hasTitle) {
-                return String.format(CSVResponseFormat.response, CSVResponseFormat.appendTitle(entityType, special), formatSearchResults("text/csv", searchResult.getSearchResults()));
-            }
-            return String.format(CSVResponseFormat.response, "", formatSearchResults(type, searchResult.getSearchResults()));
-
-        } else if (type.equals(MediaType.TEXT_HTML)) {
-            return String.format(HTMLResponseFormat.response, formatSearchResults(type, searchResult.getSearchResults()));
-        }
-
-        //default xml
-        return String.format(XMLResponseFormat.response, createMeta(request, type, query, filters, searchResult.getTotal(), searchResult.getPage(), searchResult.getSize()), formatSearchResults(type, searchResult.getSearchResults()), formatRefineResults(type, searchResult.getBrowseResults()));
-    }
-
-    private static String formatRefineResults(String type, List<String> refineResults) {
-        if (type.equals(MediaType.APPLICATION_JSON)) {
-            if (refineResults == null || refineResults.isEmpty()) {
-                return ",\"refineResults\":{}";
-            }
-
-            return ",\"refineResults\": {" + appendJSONStrings(refineResults) + "}";
-        }
-
-        if (refineResults == null || refineResults.isEmpty()) {
-            return "<refineResults></refineResults>";
-        }
-
-        return "<refineResults>" + appendXMLStrings(refineResults) + "</refineResults>";
-    }
-
-    private static String formatSearchResults(String type, List<String> searchResults) {
-        if (searchResults == null || searchResults.isEmpty()) {
-            return "";
-        }
-
-        if (type.equals(MediaType.APPLICATION_JSON)) {
-            return appendJSONStrings(searchResults);
-        }
-
-        return appendXMLStrings(searchResults);
-    }
-
-    private static String appendXMLStrings(List<String> searchResults) {
-        StringBuilder stringBuilder = new StringBuilder();
-        for (String xml:searchResults) {
-            stringBuilder.append(xml);
-            //logger.debug("APPEND " + xml);
-        }
-        return stringBuilder.toString();
-    }
-
-
-    /* Now using xsl TODO: check this functionality
-    private static String appendCSVString(List<String> searchResults) {
-        StringBuilder stringBuilder = new StringBuilder();
-        for (String xml:searchResults) {
-            stringBuilder.append(xml.replaceAll("\"", "'"));
-            //logger.debug("APPEND " + xml);
-        }
-        return stringBuilder.toString();
-    } */
-
-    private static String appendJSONStrings(List<String> searchResults) {
-        StringBuilder stringBuilder = new StringBuilder();
-        for (Iterator<String> iterator = searchResults.iterator(); iterator.hasNext();) {
-            stringBuilder.append(iterator.next());
-            if (iterator.hasNext()) {
-               stringBuilder.append(",");
-            }
-        }
-        return stringBuilder.toString();
-    }
-
-    public static String createMetaBasic(HttpServletRequest request, String type) {
-        String selfPageUrl = pageUrlCreation(request);
-        if  (type.equals(MediaType.APPLICATION_JSON)) {
-            return String.format(JSONResponseFormat.metaBasic, formatSelfPaging(type, selfPageUrl));
-        }
-        return String.format(XMLResponseFormat.metaBasic, formatSelfPaging(type, selfPageUrl));
-    }
-
-    public static String createMeta(HttpServletRequest request, String type, String query, List<String> filters, int total, int currentOffset, int limit) {
-        if  (type.equals(MediaType.APPLICATION_JSON)) {
-            return String.format(JSONResponseFormat.metaSearch, StringEscapeUtils.escapeJson(query), createFilters(type, filters), total, currentOffset, limit, createPaging(request, type, total, currentOffset, limit));
-        }
-        return String.format(XMLResponseFormat.metaSearch, StringEscapeUtils.escapeXml10(query), createFilters(type, filters), total, currentOffset, limit, createPaging(request, type, total, currentOffset, limit));
-    }
-
-    public static String createFilters(String type, List<String> fieldQueries) {
-        StringBuilder builder = new StringBuilder();
-        if (fieldQueries != null) {
-            if (type.equals(MediaType.APPLICATION_JSON)) {
-                for (Iterator<String> iterator = fieldQueries.iterator(); iterator.hasNext(); ) {
-                    builder.append("\"").append(StringEscapeUtils.escapeJson(iterator.next())).append("\"");
-                    if (iterator.hasNext()) {
-                        builder.append(",");
-                    }
-                }
-            } else {
-                for (Iterator<String> iterator = fieldQueries.iterator(); iterator.hasNext(); ) {
-                    builder.append("<filter>").append(StringEscapeUtils.escapeXml10(iterator.next())).append("</filter>");
-                }
-            }
-        }
-
-        return builder.toString();
-    }
-
-    private static String createPaging(HttpServletRequest request, String type, int total, int currentOffset, int limit) {
-        String url = request.getRequestURL().toString();
-        String selfPageUrl = null;
-
-        if (limit > 0) {
-            String firstPageUrl = null;
-            String lastPageUrl = null;
-            String previousPageUrl = null;
-            String nextPageUrl = null;
-
-            if (type.equals(MediaType.APPLICATION_JSON)) {
-                selfPageUrl = pageUrlCreation(url, currentOffset, limit);
-                firstPageUrl = pageUrlCreation(url, 0, limit);
-                lastPageUrl = pageUrlCreation(url, calculateLastPage(total, limit), limit);
-                previousPageUrl = pageUrlCreation(url, calculatePreviousPage(total, currentOffset, limit), limit);
-                nextPageUrl = pageUrlCreation(url, calculateNextPage(total, currentOffset, limit), limit);
-            } else {
-                selfPageUrl = StringEscapeUtils.escapeXml10(pageUrlCreation(url, currentOffset, limit));
-                firstPageUrl = StringEscapeUtils.escapeXml10(pageUrlCreation(url, 0, limit));
-                lastPageUrl = StringEscapeUtils.escapeXml10(pageUrlCreation(url, calculateLastPage(total, limit), limit));
-                previousPageUrl = StringEscapeUtils.escapeXml10(pageUrlCreation(url, calculatePreviousPage(total, currentOffset, limit), limit));
-                nextPageUrl = StringEscapeUtils.escapeXml10(pageUrlCreation(url, calculateNextPage(total, currentOffset, limit), limit));
-            }
-
-            return formatPaging(type, firstPageUrl, lastPageUrl, previousPageUrl, nextPageUrl, selfPageUrl);
-
-        }
-
-        if (type.equals(MediaType.APPLICATION_JSON)) {
-            selfPageUrl = pageUrlCreation(url, currentOffset, limit);
-        } else {
-            selfPageUrl = StringEscapeUtils.escapeXml10(pageUrlCreation(url, currentOffset, limit));
-        }
-        return formatSelfPaging(type, selfPageUrl);
-    }
-
-    private static String formatPaging(String type, String first, String last, String previous, String next, String self) {
-        if (type.equals(MediaType.APPLICATION_JSON)) {
-            return String.format(JSONResponseFormat._links, first, last, previous, next, self);
-        }
-        return String.format(XMLResponseFormat._links, first, last, previous, next, self);
-    }
-
-    private static String formatSelfPaging(String type, String self) {
-        if (type.equals(MediaType.APPLICATION_JSON)) {
-            return String.format(JSONResponseFormat._selflink, self);
-        }
-
-        return String.format(XMLResponseFormat._selflink, self);
-    }
-
-    private static int calculateLastPage(int total, int limit) {
-        if (total <= limit) {
-            return 0;
-
-        } else {
-            if (total%limit == 0) {
-                return total / limit - 1;
-            }
-            return total/limit ;
-        }
-    }
-
-    private static int calculatePreviousPage(int total, int currentOffset, int limit) {
-        if (currentOffset-1 <= 0) {
-            return 0;
-        }
-
-        int lastPage = calculateLastPage(total, limit);
-        return (currentOffset-1 < lastPage) ? (currentOffset-1) : lastPage;
-    }
-
-    private static int calculateNextPage(int total, int currentOffset, int limit) {
-        int lastPage = calculateLastPage(total, limit);
-        return (currentOffset + 1 >= lastPage) ? lastPage:(currentOffset+1);
-    }
-
-    private static String pageUrlCreation(String urlPrefix, int offset, int limit) {
-        return urlPrefix + "?page=" + offset + "&size=" + limit;
-    }
-
-    private static String pageUrlCreation(HttpServletRequest request) {
-        StringBuffer requestURL = request.getRequestURL();
-        String queryString = request.getQueryString();
-
-        if (queryString == null) {
-            return requestURL.toString();
-        } else {
-            return requestURL.append('?').append(queryString).toString();
-        }
-    }
-
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/SearchServiceContextUtils.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/SearchServiceContextUtils.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/SearchServiceContextUtils.java	(nonexistent)
@@ -1,77 +0,0 @@
-/**
- * 
- */
-package eu.dnetlib.data.search.web;
-
-import eu.dnetlib.api.data.SearchService;
-import gr.uoa.di.driver.enabling.resultset.ResultSetFactory;
-import org.springframework.context.ApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-
-/**
- * @author stoumpos
- * 
- */
-public class SearchServiceContextUtils {
-
-	public static SearchService getSearchService(HttpServletRequest request) {
-		ServletContext session = request.getSession().getServletContext();
-		ApplicationContext context = WebApplicationContextUtils
-				.getWebApplicationContext(session);
-		SearchService search = (SearchService) context.getBean("searchService");
-
-		return search;
-	}
-
-	public static ResultSetFactory getResultSetFactory(
-			HttpServletRequest request) {
-		ServletContext session = request.getSession().getServletContext();
-		ApplicationContext context = WebApplicationContextUtils
-				.getWebApplicationContext(session);
-		ResultSetFactory rsFactory = (ResultSetFactory) context
-				.getBean("resultSetFactory");
-
-		return rsFactory;
-	}
-
-	public static final String prettyPrint(String xml)
-			throws TransformerConfigurationException,
-			TransformerFactoryConfigurationError, TransformerException,
-			SAXException, IOException, ParserConfigurationException {
-
-		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-		dbf.setValidating(true);
-		DocumentBuilder db = dbf.newDocumentBuilder();
-		InputSource sourceXML = new InputSource(new StringReader(xml));
-		Document xmlDoc = db.parse(sourceXML);
-		Element source = xmlDoc.getDocumentElement();
-		source.normalize();
-
-		StreamResult target = new StreamResult(new StringWriter());
-
-		Transformer tf = TransformerFactory.newInstance().newTransformer();
-		tf.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
-		tf.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
-		tf.setOutputProperty(OutputKeys.INDENT, "yes");
-		tf.transform(new DOMSource(source), target);
-
-		return target.getWriter().toString();
-	}
-
-}

Property changes on: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/SearchServiceContextUtils.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/utils/RequestResponseHandler.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/utils/RequestResponseHandler.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/web/utils/RequestResponseHandler.java	(nonexistent)
@@ -1,166 +0,0 @@
-package eu.dnetlib.data.search.web.utils;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by kiatrop on 19/9/2016.
- */
-public class RequestResponseHandler {
-
-    public enum Entity {
-        PUBLICATION("publication"),
-        DATASET("dataset"),
-        PROJECT("project"),
-        DATASOURCE("datasource"),
-        ORGANIZATION("organization"),
-        PERSON("person"),
-        SOFTWARE("software"),
-        OTHER("other"),
-        NONE("");
-
-        private final List<String> PUBLICATION_FIELD_QUERIES = Arrays.asList("oaftype exact result", "resulttypeid exact publication");
-        private final List<String> DATASET_FIELD_QUERIES = Arrays.asList("oaftype exact result", "resulttypeid exact dataset");
-        private final List<String> SOFTWARE_FIELD_QUERIES = Arrays.asList("oaftype exact result", "resulttypeid exact software");
-        private final List<String> OTHER_FIELD_QUERIES = Arrays.asList("oaftype exact result", "resulttypeid exact other");
-        private final List<String> PROJECT_FIELD_QUERIES = Arrays.asList("oaftype exact project");
-        private final List<String> DATASOURCE_FIELD_QUERIES = Arrays.asList("oaftype exact datasource", "(datasourcecompatibilityid <> \"UNKNOWN\")");
-        private final List<String> ORGANIZATION_FIELD_QUERIES = Arrays.asList("oaftype exact organization",
-                "reldatasourcecompatibilityid exact driver or reldatasourcecompatibilityid exact driver-openaire2.0 or " +
-                "reldatasourcecompatibilityid exact openaire2.0 or reldatasourcecompatibilityid exact openaire3.0 or " +
-                "reldatasourcecompatibilityid exact openaire2.0_data or reldatasourcecompatibilityid exact hostedBy or relproject=*");
-
-        private final List<String> PERSON_FIELD_QUERIES = Arrays.asList("oaftype exact person");
-
-        private String value;
-        Entity(String value) {
-            this.value = value;
-        }
-        private String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return this.getValue();
-        }
-
-        public String getQueryPrefix() {
-            switch (this) {
-                case PUBLICATION:
-                    return PUBLICATION_PREFIX;
-
-                case DATASET:
-                    return DATASET_PREFIX;
-
-                case SOFTWARE:
-                    return SOFTWARE_PREFIX;
-
-                case OTHER:
-                    return OTHER_PREFIX;
-
-                case PROJECT:
-                    return PROJECT_PREFIX;
-
-                case DATASOURCE:
-                    return DATASOURCE_PREFIX;
-
-                case ORGANIZATION:
-                    return ORGANIZATION_PREFIX;
-
-                case PERSON:
-                    return PERSON_PREFIX;
-
-                case NONE:
-                    return "";
-
-                default:
-                    throw new IllegalArgumentException();
-            }
-
-        }
-
-        public String getPlural() {
-            switch (this) {
-                case PUBLICATION:
-                    return "publications";
-
-                case DATASET:
-                    return "datasets";
-
-                case SOFTWARE:
-                    return "software";
-
-                case OTHER:
-                    return "other";
-
-                case PROJECT:
-                    return "projects";
-
-                case DATASOURCE:
-                    return "datasources";
-
-                case ORGANIZATION:
-                    return "organizations";
-
-                case PERSON:
-                    return "people";
-
-                case NONE:
-                    return "resources";
-
-                default:
-                    throw new IllegalArgumentException();
-            }
-        }
-
-        public List<String> getFieldQueries() {
-            switch (this) {
-                case PUBLICATION:
-                    return PUBLICATION_FIELD_QUERIES;
-
-                case DATASET:
-                    return DATASET_FIELD_QUERIES;
-
-                case SOFTWARE:
-                    return SOFTWARE_FIELD_QUERIES;
-
-                case OTHER:
-                    return OTHER_FIELD_QUERIES;
-
-                case PROJECT:
-                    return PROJECT_FIELD_QUERIES;
-
-                case DATASOURCE:
-                    return DATASOURCE_FIELD_QUERIES;
-
-                case ORGANIZATION:
-                    return ORGANIZATION_FIELD_QUERIES;
-
-                case PERSON:
-                    return PERSON_FIELD_QUERIES;
-
-                default:
-                    throw new IllegalArgumentException();
-            }
-
-        }
-
-    }
-
-    public final static String PUBLICATION_PREFIX = "(oaftype exact result) and (resulttypeid exact publication)";
-    public final static String DATASET_PREFIX = "(oaftype exact result) and (resulttypeid exact dataset)";
-    public final static String SOFTWARE_PREFIX = "(oaftype exact result) and (resulttypeid exact software)";
-    public final static String OTHER_PREFIX = "(oaftype exact result) and (resulttypeid exact other)";
-    public final static String PROJECT_PREFIX = "(oaftype exact project)";
-    public final static String DATASOURCE_PREFIX = "(oaftype exact datasource) and (datasourcecompatibilityid <> \"UNKNOWN\")";
-    public final static String ORGANIZATION_PREFIX = "(oaftype exact organization and " +
-            "(reldatasourcecompatibilityid=driver or reldatasourcecompatibilityid=driver-openaire2.0 or " +
-            "reldatasourcecompatibilityid=openaire2.0 or reldatasourcecompatibilityid=openaire3.0 or " +
-            "reldatasourcecompatibilityid=openaire2.0_data or reldatasourcecompatibilityid=hostedBy " +
-            "or relproject=*)";
-    public final static String PERSON_PREFIX = "(oaftype exact person)";
-
-
-
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/HeaderFilter.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/HeaderFilter.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/HeaderFilter.java	(nonexistent)
@@ -1,27 +0,0 @@
-package eu.dnetlib.data.search;
-
-import org.apache.log4j.Logger;
-
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-
-public class HeaderFilter implements Filter{
-    private ServletContext context;
-
-    private Logger logger = Logger.getLogger(HeaderFilter.class);
-    @Override
-    public void init(FilterConfig filterConfig) throws ServletException {
-        this.context = filterConfig.getServletContext();
-    }
-
-    @Override
-    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
-        filterChain.doFilter(new CustomHttpServletRequest((HttpServletRequest)servletRequest), servletResponse);
-    }
-
-    @Override
-    public void destroy() {
-
-    }
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/solr/SolrResultSetFactory.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/solr/SolrResultSetFactory.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/solr/SolrResultSetFactory.java	(nonexistent)
@@ -1,71 +0,0 @@
-package eu.dnetlib.data.search.solr;
-
-import eu.dnetlib.domain.EPR;
-import eu.dnetlib.domain.SecureDriverResource;
-import gr.uoa.di.driver.enabling.resultset.ResultSet;
-import gr.uoa.di.driver.enabling.resultset.ResultSetFactory;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
-import org.apache.log4j.Logger;
-import org.apache.solr.client.solrj.impl.CloudSolrClient;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by antleb on 2/4/14.
- */
-public class SolrResultSetFactory implements ResultSetFactory {
-
-    private Logger logger = Logger.getLogger(getClass());
-    private Map<String, CloudSolrClient> clients = new HashMap<String, CloudSolrClient>();
-
-    @Autowired
-    private PrometheusMeterRegistry prometheusMeterRegistry;
-
-
-    @Override
-    public ResultSet<String> createResultSet(EPR epr) {
-        try {
-
-            String[] zkservers= epr.getAddress().split(",");
-
-            CloudSolrClient solrClient;
-
-            synchronized (clients) {
-                solrClient =  clients.get(epr.getAddress());
-            }
-            if (solrClient == null) {
-                solrClient = new CloudSolrClient.Builder().withZkHost(Arrays.asList(zkservers)).build();
-
-                clients.put(epr.getAddress(), solrClient);
-            }
-
-            ResultSet<String> solrResultSets = new SolrResultSet(epr, solrClient, prometheusMeterRegistry);
-
-            return solrResultSets;
-
-        } catch (Exception e) {
-            logger.error("Error creating solr client", e);
-        }
-
-        logger.debug("NOT HERE!");
-        return null;
-    }
-
-    @Override
-    public <D> ResultSet<D> createResultSet(EPR epr, Class<D> resourceClass) {
-        return (ResultSet<D>) createResultSet(epr);
-    }
-
-    @Override
-    public <D> ResultSet<D> createResultSet(ResultSet<?> rs, Class<D> resourceClass) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public <D extends SecureDriverResource> ResultSet<D> createSecurityAwareRS(EPR epr, Class<D> resourceClass) {
-        throw new UnsupportedOperationException();
-    }
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/solr/SolrClientLocator.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/solr/SolrClientLocator.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/solr/SolrClientLocator.java	(nonexistent)
@@ -1,85 +0,0 @@
-package eu.dnetlib.data.search.solr;
-
-import eu.dnetlib.api.data.IndexService;
-import eu.dnetlib.api.enabling.ISLookUpService;
-import eu.dnetlib.api.enabling.ISLookUpServiceException;
-import gr.uoa.di.driver.util.ServiceLocator;
-import org.apache.log4j.Logger;
-
-import java.util.List;
-
-/**
- * Created by antleb on 2/4/14.
- */
-public class SolrClientLocator implements ServiceLocator<IndexService> {
-    private Logger logger = Logger.getLogger(getClass());
-
-    private SolrIndexClient indexClient = null;
-    private ServiceLocator<ISLookUpService> lookUpServiceServiceLocator = null;
-    private String interpretation = null;
-
-    private String cachedUrl = null;
-
-    @Override
-    public IndexService getService() {
-        if (indexClient == null) {
-            indexClient = locateIndexService();
-        }
-
-        return indexClient;
-    }
-
-    private SolrIndexClient locateIndexService() {
-        SolrIndexClient client = new SolrIndexClient();
-
-        try {
-            List<String> urls = lookUpServiceServiceLocator.getService().quickSearchProfile("for $x in //RESOURCE_PROFILE//PROTOCOL[./@name='solr'] return data($x/@address)");
-
-            if (urls.size() > 0) {
-                cachedUrl = chooseIndexService(urls);
-
-            } else {
-                logger.warn("Falling back to cached value for index : " + cachedUrl);
-                throw new IllegalArgumentException("Could not locate an index service with a SOLR interface");
-            }
-
-        } catch (ISLookUpServiceException ise) {
-            logger.warn("Error locating service", ise);
-
-        } finally {
-            logger.warn("Falling back to cached value for index : " + cachedUrl);
-            client.setSolrServerUrl(cachedUrl);
-            client.setInterpretation(this.interpretation);
-        }
-
-        return client;
-    }
-
-    private String chooseIndexService(List<String> urls) {
-        return urls.get(0);
-    }
-
-    public ServiceLocator<ISLookUpService> getLookUpServiceServiceLocator() {
-        return lookUpServiceServiceLocator;
-    }
-
-    public void setLookUpServiceServiceLocator(ServiceLocator<ISLookUpService> lookUpServiceServiceLocator) {
-        this.lookUpServiceServiceLocator = lookUpServiceServiceLocator;
-    }
-
-    public String getInterpretation() {
-        return interpretation;
-    }
-
-    public void setInterpretation(String interpretation) {
-        this.interpretation = interpretation;
-    }
-
-    public String getCachedUrl() {
-        return cachedUrl;
-    }
-
-    public void setCachedUrl(String cachedUrl) {
-        this.cachedUrl = cachedUrl;
-    }
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/solr/SolrIndexClient.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/solr/SolrIndexClient.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/solr/SolrIndexClient.java	(nonexistent)
@@ -1,112 +0,0 @@
-package eu.dnetlib.data.search.solr;
-
-import eu.dnetlib.api.DriverServiceException;
-import eu.dnetlib.api.data.IndexService;
-import eu.dnetlib.api.data.IndexServiceException;
-import eu.dnetlib.domain.EPR;
-import eu.dnetlib.domain.ServiceIdentity;
-import eu.dnetlib.domain.data.Hint;
-import eu.dnetlib.domain.enabling.Notification;
-
-import java.util.List;
-
-/**
- * Created by antleb on 2/4/14.
- */
-public class SolrIndexClient implements IndexService {
-    private String solrServerUrl = null;
-
-    private String interpretation = null;
-
-    @Override
-    public EPR indexLookup(String id, String query, String mdformat, String layout) throws IndexServiceException {
-        EPR epr = new EPR();
-
-        epr.setAddress(solrServerUrl);
-        epr.setParameter("action", "lookup");
-        epr.setParameter("id", id);
-        epr.setParameter("query", query);
-        epr.setParameter("mdformat", mdformat);
-        epr.setParameter("layout", layout);
-        epr.setParameter("interpretation", this.interpretation);
-
-        return epr;
-    }
-
-    @Override
-    public EPR getBrowsingStatistics(String query, String index, String mdFormatId, String layoutId) throws IndexServiceException {
-        EPR epr = new EPR();
-
-        epr.setAddress(solrServerUrl);
-        epr.setParameter("action", "browse");
-        epr.setParameter("id", index);
-        epr.setParameter("query", query);
-        epr.setParameter("mdformat", mdFormatId);
-        epr.setParameter("layout", layoutId);
-        epr.setParameter("interpretation", this.interpretation);
-
-        return epr;
-    }
-
-    public void newMethod(){}
-
-    public EPR getBrowsingStatistics2(String query, String index, String mdFormatId, String layoutId) throws IndexServiceException {
-        EPR epr = new EPR();
-
-        epr.setAddress(solrServerUrl);
-        epr.setParameter("action", "browse");
-        epr.setParameter("id", index);
-        epr.setParameter("query", query);
-        epr.setParameter("mdformat", mdFormatId);
-        epr.setParameter("layout", layoutId);
-        epr.setParameter("interpretation", this.interpretation);
-
-        return epr;
-    }
-
-    @Override
-    public Hint suggestiveSearch(String s, String s2, String s3, String s4, String s5) throws IndexServiceException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public List<String> getListOfIndices() throws IndexServiceException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public String getIndexStatistics(String s) throws IndexServiceException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public String getListOfIndicesCSV() throws IndexServiceException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ServiceIdentity identify() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void notify(Notification notification) throws DriverServiceException {
-        throw new UnsupportedOperationException();
-    }
-
-    public String getSolrServerUrl() {
-        return solrServerUrl;
-    }
-
-    public void setSolrServerUrl(String solrServerUrl) {
-        this.solrServerUrl = solrServerUrl;
-    }
-
-    public String getInterpretation() {
-        return interpretation;
-    }
-
-    public void setInterpretation(String interpretation) {
-        this.interpretation = interpretation;
-    }
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/solr/SolrResultSet.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/solr/SolrResultSet.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/solr/SolrResultSet.java	(nonexistent)
@@ -1,541 +0,0 @@
-package eu.dnetlib.data.search.solr;
-
-import com.google.gson.Gson;
-import eu.dnetlib.api.data.SearchServiceException;
-import eu.dnetlib.data.search.transform.Transformer;
-import eu.dnetlib.data.search.transform.TransformerException;
-import eu.dnetlib.data.search.utils.solr.SolrResultSetOptionsUtil;
-import eu.dnetlib.data.search.utils.solr.SolrResultsFormatter;
-import eu.dnetlib.domain.EPR;
-import gr.uoa.di.driver.enabling.resultset.ResultSet;
-import io.micrometer.core.instrument.Timer;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.log4j.Logger;
-import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.impl.CloudSolrClient;
-import org.apache.solr.client.solrj.response.FacetField;
-import org.apache.solr.client.solrj.response.QueryResponse;
-import org.apache.solr.common.SolrDocumentList;
-import org.apache.solr.common.params.SolrParams;
-import org.apache.solr.common.util.NamedList;
-import org.z3950.zing.cql.CQLParseException;
-
-import javax.ws.rs.core.MediaType;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.*;
-
-/**
- * Created by antleb on 2/4/14.
- */
-
-public class SolrResultSet implements ResultSet<String> {
-
-    private Logger logger = Logger.getLogger(getClass());
-
-    private EPR epr = null;
-    public SolrClient solrClient = null;
-
-    private NamedList<String> queryOpts = new NamedList<String>();
-    long size = -1;
-
-    private PrometheusMeterRegistry registry;
-
-    public SolrResultSet(EPR epr, CloudSolrClient cloudSolrClient, PrometheusMeterRegistry registry) throws IOException, CQLParseException {
-        logger.debug("Setting solr client " + cloudSolrClient);
-        this.epr = epr;
-        this.solrClient = cloudSolrClient;
-        this.queryOpts = SolrResultSetOptionsUtil.extractQueryOptions(epr.getParameter("query"));
-
-        String layout = epr.getParameter("layout");
-        String mdformat = epr.getParameter("mdformat");
-        String interpretation = epr.getParameter("interpretation");
-
-        ((CloudSolrClient)solrClient).setDefaultCollection(mdformat + "-" + layout + "-" + interpretation);
-
-        this.registry = registry;
-    }
-
-    @Override
-    public boolean isOpen() {
-        return true;
-    }
-
-    @Override
-    public boolean isAlive() {
-        return true;
-    }
-
-    @Override
-    public void close() {
-/*
-        try {
-            logger.debug("!!!!!!!!! !!!!!!! CLOSING !!!!!!!!! !!!!!!!!!! ");
-            solrClient.close();
-
-        } catch (IOException e) {
-            logger.error("Error closing result set.", e);
-        }
-*/
-    }
-
-    @Override
-    public int size() {
-        return (int) size;
-    }
-
-    @Override
-    @Deprecated
-    public List<String> getElements(int from, int to) {
-        return get(from, to);
-    }
-
-    List<FacetField> facetFields = null;
-
-    @Override
-    @Deprecated
-    public List<String> get(int from, int to) {
-        List<String> res = new ArrayList<String>();
-
-        QueryResponse rsp = null;
-
-        HashMap<String, List<String>> map = new HashMap<String, List<String>>();
-
-        logger.debug("from: " + from);
-        logger.debug("to: " + to);
-
-
-        queryOpts.add("start", from+1 + "");
-        queryOpts.add("rows", to + 1+"");
-
-        try {
-
-            rsp = solrClient.query(SolrParams.toSolrParams(queryOpts));
-
-            facetFields = rsp.getFacetFields();
-            SolrDocumentList docs = rsp.getResults();
-
-            if (facetFields!=null && !facetFields.isEmpty()) {
-                for (int i = from - 1; i < to; i++) {
-                    for (FacetField field : facetFields) {
-                        if (field.getValueCount() > i) {
-                            BrowseField bf = new BrowseField();
-                            bf.setId(field.getValues().get(i).getName());
-                            bf.setName(field.getValues().get(i).getName());
-                            bf.setCount(field.getValues().get(i).getCount() + "");
-                            if (map.get(field.getName()) == null) {
-                                map.put(field.getName(), new ArrayList<String>());
-                            }
-
-                            map.get(field.getName()).add(new Gson().toJson(bf));
-                        }
-                    }
-                }
-
-                for (Map.Entry<String, List<String>> facetEntry : map.entrySet()) {
-                    StringBuilder builder = new StringBuilder();
-                    builder.append("\"" + facetEntry.getKey() + "\"" + " : ");
-                    builder.append(facetEntry.getValue());
-                    res.add(builder.toString());
-                }
-            }
-
-            logger.debug("time: " + rsp.getElapsedTime());
-            logger.debug("found: " + docs.getNumFound());
-            logger.debug("docs: " + docs.size());
-
-            for (int i = 0; i < docs.size(); i++) {
-                String result = (String) docs.get(i).get("__result");
-                res.add(result);
-            }
-
-            return res;
-
-        } catch (SolrServerException sse) {
-            logger.error("Fail to get results from Solr. ", sse);
-
-        } catch (IOException ioe) {
-            logger.error("Fail to get results from Solr. ", ioe);
-        }
-
-        return null;
-    }
-
-    @Override
-    public EPR getEpr() {
-        return null;
-    }
-
-    public Map<String,List<String>> newGet(int from, int to, String format, Transformer transformer, Transformer oldRefineTransformer) {
-        List<String> refineSolrResults = new ArrayList<String>();
-        List<String> searchSolrResults = new ArrayList<String>();
-
-        QueryResponse rsp = null;
-        HashMap<String, List<String>> map = new HashMap<String, List<String>>();
-
-        queryOpts.add("start", from*to + "");
-        queryOpts.add("rows", to +"");
-
-        long startTime = System.nanoTime();
-
-        try {
-            io.micrometer.core.instrument.Timer.Sample timer = Timer.start(registry);
-            rsp = solrClient.query(SolrParams.toSolrParams(queryOpts));
-            timer.stop(registry.timer("solr.server.response.duration"));
-
-
-            long estimatedTime = System.nanoTime() - startTime;
-            logger.info("Solrj time " + estimatedTime/1000000 +  " milliseconds for query:" + queryOpts.get("q") +
-                    " and facets " + queryOpts.getAll("facet.field") + " and fq " + queryOpts.getAll("fq") + " from: "
-                    + from + " and size " + to);
-
-            facetFields = rsp.getFacetFields();
-
-            SolrDocumentList docs = rsp.getResults();
-
-            this.size = docs.getNumFound();
-
-            if (facetFields!=null && !facetFields.isEmpty()) {
-                if (format != null && format.equals(MediaType.APPLICATION_JSON)) {
-                    for (FacetField field : facetFields) {
-                        map.put(field.getName(), new ArrayList<String>());
-                        BrowseField bf = null;
-                        for (int i = 0; i < field.getValueCount(); i++) {
-                            bf = new BrowseField();
-                            //bf.setId(org.apache.commons.lang3.StringEscapeUtils.escapeJson(field.getValues().get(i).getName()));
-                            bf.setId(field.getValues().get(i).getName());
-                            String[] facetedValues = field.getValues().get(i).getName().split("\\|\\|",2);
-
-
-                            logger.debug("faceted values " + Arrays.toString(facetedValues));
-
-                            if (facetedValues.length > 1) {
-                                //bf.setName(org.apache.commons.lang3.StringEscapeUtils.escapeJson(facetedValues[1]));
-                                bf.setName(facetedValues[1]);
-                                logger.debug("faceted values [1] " + facetedValues[1]);
-
-                            } else if (field.getValues().get(i).getName().split("_\\:\\:",2).length > 1) {
-                                //bf.setName(org.apache.commons.lang3.StringEscapeUtils.escapeJson(field.getValues().get(i).getName().split("\\:\\:",2)[1]).replaceAll("\\:\\:", "\\|"));
-                                bf.setName(field.getValues().get(i).getName().split("\\:\\:",2)[1].replaceAll("\\:\\:", "\\|"));
-
-                            } else {
-                                //bf.setName(org.apache.commons.lang3.StringEscapeUtils.escapeJson(field.getValues().get(i).getName()));
-                                bf.setName(field.getValues().get(i).getName());
-                            }
-
-                            bf.setCount(field.getValues().get(i).getCount() + "");
-                            map.get(field.getName()).add(new Gson().toJson(bf));
-                        }
-
-                    }
-
-                    StringBuilder builder = null;
-
-                    for (Map.Entry<String, List<String>> facetEntry : map.entrySet()) {
-                        builder = new StringBuilder();
-                        builder.append("\"" + facetEntry.getKey() + "\"" + " : ");
-                        builder.append(facetEntry.getValue());
-                        refineSolrResults.add(builder.toString());
-                    }
-
-                } else { //the old implementation & xml as default
-                    logger.debug("Creating old browse results.");
-                    createXmlRefineFields(refineSolrResults, oldRefineTransformer);
-                }
-            }
-
-            for (int i = 0; i < docs.size(); i++) {
-                String result = (String) docs.get(i).get("__result");
-
-                logger.debug("["+ i +"]: " + docs.get(i).get("__result"));
-
-                try {
-                    if (transformer != null) {
-                        logger.debug("1 >>>>>>" + result);
-                        String xml = result.replaceAll("<em>","").replaceAll("</em>","");
-                        result = transformer.transform(xml);
-                        logger.debug("2 >>>>>>" + result);
-                    }
-
-                } catch (TransformerException te) {
-                    logger.warn("Error transforming " + result, te);
-                    continue;
-                }
-
-                if (format != null && format.equals(MediaType.APPLICATION_JSON)) {
-                    searchSolrResults.add(SolrResultsFormatter.xml2Json(result));
-                } else { // default xml
-                    searchSolrResults.add(result);
-                }
-            }
-
-            Map<String,List<String>> response = new HashMap<String, List<String>>();
-
-            //logger.debug("refine results " + refineSolrResults);
-            //logger.info("search results SIZE " + searchSolrResults.size());
-            //logger.info("search results " + searchSolrResults);
-
-
-            response.put("refine",refineSolrResults);
-            response.put("search", searchSolrResults);
-
-            return response;
-
-        } catch (SolrServerException sse) {
-            logger.error("Error calling Solr.", sse);
-
-        } catch (IOException ioe) {
-            logger.error("Error calling Solr.", ioe);
-
-        }
-
-        return null;
-    }
-
-    public void cursorGet(Transformer transformer, OutputStream os) throws SolrServerException, SearchServiceException {
-        queryOpts.add("start", "0");
-        queryOpts.add("rows", "0");
-        queryOpts.remove("rows");
-        queryOpts.add("rows", "500");
-        queryOpts.add("fl", "__result");
-        queryOpts.add("shards.tolerant","true");
-        queryOpts.add("cursorMark", "*");
-        queryOpts.add("sort", "__indexrecordidentifier asc");
-
-        String cursorMark = "*";
-        String nextCursorMark = "";
-
-        int curs = 0;
-        try {
-            QueryResponse resp = solrClient.query(SolrParams.toSolrParams(queryOpts));
-
-            while (!cursorMark.equals(nextCursorMark)) {
-                resp = solrClient.query(SolrParams.toSolrParams(queryOpts));
-                cursorMark = nextCursorMark;
-                nextCursorMark = resp.getNextCursorMark();
-
-                for (int i = 0; i < resp.getResults().size(); i++) {
-                    if (transformer != null) {
-                        String result = null;
-                        try {
-                            result = transformer.transform((String) resp.getResults().get(i).get("__result"));
-                            logger.debug("RESULT " + result);
-
-                        } catch (TransformerException te) {
-                            logger.warn("Error transforming " + result, te);
-                            continue;
-                        }
-
-                        try {
-                            os.write(result.getBytes());
-                            os.flush();
-                        } catch (IOException e) {
-                            logger.error("Cursor get... ", e);
-                            continue;
-                        }
-                    }
-                }
-
-                queryOpts.remove("cursorMark");
-                queryOpts.add("cursorMark", nextCursorMark);
-                curs++;
-            }
-
-        } catch (IOException ioe) {
-            logger.error("Error executing solr query. ", ioe);
-        }
-
-        logger.debug("CURS " + curs);
-    }
-
-
-    //TODO get rid of this as soon as Joomla portal is out
-    //Just copied and refactored the old one...
-    @Deprecated
-    private void createXmlRefineFields(List<String> res, Transformer oldRefineTransformer) {
-        int max = -12;
-
-        for (FacetField field:facetFields) {
-            logger.debug("field " + field.getName() + " has count " + field.getValueCount());
-
-            if (field.getValueCount() > max) {
-                max = field.getValueCount();
-            }
-        }
-
-        logger.debug("max " + max);
-
-        for (int i = 0; i < max; i++) {
-            StringBuilder sb = new StringBuilder();
-
-            sb.append("<row>");
-            for (FacetField field:facetFields) {
-                if (field.getValueCount() > i) {
-                    sb.append("<groupresult field=\"").append(field.getName()).append("\">");
-                    sb.append("<count>").append(field.getValues().get(i).getCount()).append("</count>");
-                    sb.append("<originalValue>").append(StringEscapeUtils.escapeXml(field.getValues().get(i).getName())).append("</originalValue>");
-
-                    String[] facetValues = field.getValues().get(i).getName().split("\\|\\|");
-                    if(facetValues.length > 1) {
-                        sb.append("<value>").append(StringEscapeUtils.escapeXml(facetValues[1])).append("</value>");
-                    } else {
-                        sb.append("<value>").append(StringEscapeUtils.escapeXml(facetValues[0])).append("</value>");
-                    }
-                    sb.append("</groupresult>");
-                }
-            }
-            sb.append("</row>");
-
-            try {
-                //logger.debug("row: " + sb.toString());
-                //logger.debug("row2: " + oldRefineTransformer.transform(sb.toString()));
-
-                //TODO remove
-                res.add(oldRefineTransformer.transform(sb.toString()));
-
-            } catch (TransformerException te) {
-                logger.error("Cannot transform refine for: " + sb.toString(), te);
-            }
-        }
-    }
-
- /*   public static void main(String[] args) throws IOException, CQLParseException, SolrServerException {
-        CloudSolrServer solrClient = new CloudSolrServer("beta.solr.openaire.eu:9983");
-        solrClient.setDefaultCollection("DMF-index-openaire");
-
-        NamedList<String> queryOpts = new NamedList<String>();
-
-        //q=*:*&start=0&rows=10&cursorMark=*&sort=dateofcollection asc
-        queryOpts.add("q", new CqlTranslatorImpl().getTranslatedQuery("objIdentifier = acm_________::0002c24f82c295e925a2bdf7bbf49bfc").asLucene());
-        queryOpts.add("start", "0");
-        queryOpts.add("rows", "1");
-        queryOpts.add("fl", "__result");
-        queryOpts.add("shards.tolerant","true");
-        queryOpts.add("cursorMark", "*");
-        queryOpts.add("sort", "__indexrecordidentifier asc");
-
-
-        //queryOpts.add("q", new CqlTranslatorImpl().getTranslatedQuery("oaftype exact project").asLucene());
-        NamedList<String> extraOpts = new NamedList<String>();
-
-        QueryResponse resp = solrClient.query(SolrParams.toSolrParams(queryOpts));
-
-        System.out.println("results " + resp.getResults().size());
-
-        String cursorMark = "*";
-        String nextCursorMark = "";
-
-        int curs = 0;
-        while (!cursorMark.equals(nextCursorMark)) {
-            System.out.println("cursor " + cursorMark);
-            System.out.println("next cursor " + nextCursorMark);
-            cursorMark = nextCursorMark;
-            for (int i = 0; i < resp.getResults().size(); i++) {
-                String result = ((ArrayList<String>) resp.getResults().get(i).get("__result")).get(0);
-                //System.out.println(result);
-                resp = solrClient.query(SolrParams.toSolrParams(queryOpts));
-            }
-            nextCursorMark = resp.getNextCursorMark();
-            queryOpts.add("cursorMark", nextCursorMark);
-
-            System.out.println("CURS " + curs);
-            curs ++;
-
-        }
-
-
-        //System.out.println((new CqlTranslatorImpl().getTranslatedQuery("objIdentifier = acm_________::0002c24f82c295e925a2bdf7bbf49bfc").asLucene()));
-
-
-
-        //extraOpts.add("start", "1");
-       // extraOpts.add("rows", "10");
-       // extraOpts.addAll(queryOpts);
-
-        //queryOpts.add("facet", "true");
-        //TranslatedQuery translatedQuery = new CqlTranslatorImpl().getTranslatedQuery("oaftype=result sortBy resultdateofacceptance/sort.descending");
-
-     //   queryOpts.add("q", "oaftype=project");
-        //queryOpts.add("facet", "true");
-        //queryOpts.add("facet.mincount", "1");
-        //queryOpts.add("fq", "popularity");
-
-
-
-//        queryOpts.put("fq", new CqlTranslatorImpl().getTranslatedQuery("").asLucene());
-       // queryOpts.add("facet.field", "contextid");
-       //  queryOpts.add("facet.field", "contextname");
-       //  queryOpts.add("facet.mincount", "1");
-       //  queryOpts.add("facet.threads", "10");
-       // System.out.println(translatedQuery.getOptions().getSort().getMode());
-       // System.out.println(translatedQuery.getOptions().getSort().getField());
-
-        //queryOpts.add("sort", translatedQuery.getOptions().getSort().getField() + " " + translatedQuery.getOptions().getSort().getMode() );
-
-
-
-/*        QueryResponse resp = null;
-        synchronized (solrClient) {
-            resp = solrClient.query(SolrParams.toSolrParams(extraOpts));
-        }*/
-//        System.out.println("time: " + resp.getElapsedTime());
-    //System.out.println("results: " + resp.getResults());
-
-/*      System.out.println(resp.getFacetField("contextname").getValueCount());
-
-        for (FacetField.Count count:resp.getFacetField("contextname").getValues())
-            System.out.println(count.getName() + " : " +  count.getCount());
-
-
-        int max = -12;
-
-        for (FacetField field:resp.getFacetFields()) {
-            if (field.getValueCount() > max)
-                max = field.getValueCount();
-
-        }
-
-        System.out.println("max: " + max);
-*/
- //   }
-
-//    @Override
-//    public EPR getEpr() {
-//        return epr;
-//   }
-}
-
-class BrowseField {
-    String name;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getCount() {
-        return count;
-    }
-
-    public void setCount(String count) {
-        this.count = count;
-    }
-
-    String id;
-    String count;
-
-
-}
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/solr/CqlSolrTransform.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/solr/CqlSolrTransform.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/solr/CqlSolrTransform.java	(nonexistent)
@@ -1,31 +0,0 @@
-package eu.dnetlib.data.search.solr;
-
-/**
- * Created by kiatrop on 29/6/2016.
- */
-
-
-public class CqlSolrTransform {
-
-
-    /*
-    public static void main(String[] args) throws IOException, CQLParseException {
-
-        CqlTranslator translator = new CqlTranslatorImpl();
-        try {
-            BufferedReader br = new BufferedReader(new FileReader(new File("/home/kiatrop/Desktop/logs/queries.txt")));
-            FileWriter fw = new FileWriter("/home/kiatrop/Desktop/logs/solrqueriesnew.txt");
-
-            String line;
-
-            while ((line = br.readLine()) != null) {
-                fw.write("http://openaire-solr-beta.vls.icm.edu.pl:8983/solr/DMF-index-openaire_shard1_replica1/select?q=" + translator.getTranslatedQuery(URLDecoder.decode(line, "UTF-8")).asLucene()+"\n");
-            }
-
-        } catch (IOException e) {
-                e.printStackTrace();
-            }
-    }
-*/
-
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/app/SearchServiceImpl.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/app/SearchServiceImpl.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/app/SearchServiceImpl.java	(nonexistent)
@@ -1,549 +0,0 @@
-package eu.dnetlib.data.search.app;
-
-import eu.dnetlib.api.data.IndexService;
-import eu.dnetlib.api.data.IndexServiceException;
-import eu.dnetlib.api.data.SearchService;
-import eu.dnetlib.api.data.SearchServiceException;
-import eu.dnetlib.api.enabling.ISLookUpService;
-import eu.dnetlib.common.rmi.UnimplementedException;
-import eu.dnetlib.data.search.app.plan.FieldRewriteRule;
-import eu.dnetlib.data.search.app.plan.QueryRewriteRule;
-import eu.dnetlib.data.search.solr.SolrResultSet;
-import eu.dnetlib.data.search.transform.Transformer;
-import eu.dnetlib.data.search.transform.config.SearchRegistry;
-import eu.dnetlib.data.search.transform.formatter.Formatter;
-import eu.dnetlib.domain.ActionType;
-import eu.dnetlib.domain.EPR;
-import eu.dnetlib.domain.ResourceType;
-import eu.dnetlib.domain.data.FormattedSearchResult;
-import eu.dnetlib.domain.data.SearchResult;
-import eu.dnetlib.domain.data.SuggestiveResult;
-import eu.dnetlib.domain.enabling.Notification;
-import gr.uoa.di.driver.app.DriverServiceImpl;
-import gr.uoa.di.driver.enabling.issn.NotificationListener;
-import gr.uoa.di.driver.enabling.resultset.ResultSet;
-import gr.uoa.di.driver.enabling.resultset.ResultSetFactory;
-import gr.uoa.di.driver.util.ServiceLocator;
-import io.micrometer.core.instrument.Timer;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
-import org.apache.log4j.Logger;
-import org.apache.solr.client.solrj.SolrServerException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.InputSource;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathFactory;
-import java.io.OutputStream;
-import java.io.StringReader;
-import java.util.*;
-
-//import eu.dnetlib.utils.cql.CqlException;
-
-public class SearchServiceImpl extends DriverServiceImpl
-        implements SearchService {
-
-    private static Logger logger = Logger.getLogger(SearchServiceImpl.class);
-    //@Deprecated
-    //private static Logger tlogger = Logger.getLogger("eu.dnetlib.data.search.app.Timer");
-
-    private String mdFormat = "DMF";
-    private String indexLayout = "index";
-
-    private ServiceLocator<IndexService> indexLocator = null;
-    private ServiceLocator<ISLookUpService> lookUpServiceServiceLocator = null;
-    private ResultSetFactory rsFactory = null;
-
-    private SearchRegistry transformerFactory = null;
-
-    private List<QueryRewriteRule> queryRules = null;
-    private List<String> fieldQueryRules = null;
-
-    private Map<String, FieldRewriteRule> fieldRules = null;
-    private boolean enableBrowseCache = false;
-
-    private SearchServiceBlackboardHandler blackboardNotificationHandler = null;
-
-    @Autowired
-    private PrometheusMeterRegistry registry;
-
-
-    //private CQLParser cqlParser = null;
-    @Override
-    public void init() {
-        super.init();
-
-        String serviceId = this.getServiceEPR().getParameter("serviceId");
-
-        this.subscribe(
-                ActionType.UPDATE,
-                ResourceType.ANY.SEARCHSERVICERESOURCETYPE,
-                serviceId,
-                "RESOURCE_PROFILE/BODY/BLACKBOARD/LAST_REQUEST",
-                new NotificationListener() {
-
-                    @Override
-                    public void processNotification(Notification notification) {
-                        blackboardNotificationHandler.notified(
-                                notification.getSubscriptionId(),
-                                notification.getTopic(),
-                                notification.getIsId(),
-                                notification.getMessage());
-                    }
-                });
-
-        try {
-            String searchProfile = lookUpServiceServiceLocator.getService().getResourceProfile(serviceId);
-
-            if (searchProfile != null) {
-                DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-                dbf.setNamespaceAware(true);
-                DocumentBuilder db = dbf.newDocumentBuilder();
-                Document doc = db.parse(new InputSource(new StringReader(searchProfile)));
-
-
-                XPathFactory factory = XPathFactory.newInstance();
-                XPath xpath = factory.newXPath();
-
-                XPathExpression searchMdFormatExpression = xpath.compile("//SERVICE_PROPERTIES/PROPERTY[@key='mdformat']");
-                Node node = (Node) searchMdFormatExpression.evaluate(doc,XPathConstants.NODE);
-
-                if (node != null){
-                    String profileMdFormat = node.getAttributes().getNamedItem("value").getTextContent();
-                    if (profileMdFormat != null) {
-                        //logger.debug("mdformat in properties " + mdFormat );
-                        logger.info("Setting mdformat to '" + profileMdFormat + "'");
-                        mdFormat = profileMdFormat;
-                    }
-                }
-            }
-
-        } catch (Exception e) {
-            logger.error("Fail to load search service profile with id " + serviceId + " from IS.", e);
-        }
-
-    }
-
-    @Override
-    public SuggestiveResult suggestiveSearch(String query) throws SearchServiceException {
-        throw new UnimplementedException();
-    }
-
-    @Override
-    @Deprecated
-    public SearchResult search(String text, String transformer, String locale, int page, int size) throws SearchServiceException {
-        return searchNrefine(text, transformer, null, locale, page, size, null);
-    }
-
-    @Override
-    @Deprecated
-    public SearchResult refine(String text, String transformer, String locale, Collection<String> fields) throws SearchServiceException {
-        return searchNrefine(text, null, transformer, locale, 1, -1, fields);
-    }
-
-    @Override
-    @Deprecated
-    public SearchResult searchNrefine(String text, String searchTransformer, String browseTransformer,
-                                      String locale, int page, int size, Collection<String> fields) throws SearchServiceException {
-
-        //logger.info("deprecated searchNrefine > from: " + page + " to:" + size);
-        //TODO check locale
-        //logger.debug("Search transformer " + searchTransformer);
-        Transformer sTransformer = transformerFactory.getTransformer(searchTransformer, Locale.getDefault());
-        Transformer oldRefineTransformer = transformerFactory.getTransformer("results_openaire_browse", Locale.getDefault());
-
-        //logger.debug("Refine transformer " + browseTransformer);
-        //Transformer rTranformer = transformerFactory.getTransformer(refineTransformer, Locale.getDefault());
-
-        List<String> refineFields = null;
-        if (fields!=null) {
-            refineFields = new ArrayList<String>(fields);
-        }
-
-        return newSearch(text, locale, refineFields, new ArrayList<String>(), page, size, "", sTransformer, oldRefineTransformer, true);
-    }
-
-    @Override
-    public FormattedSearchResult search(String queryText, String transformerName, String format, String locale, int page, int size)
-            throws SearchServiceException {
-        return searchNrefine(queryText, transformerName, null, format, locale, page, size, null);
-    }
-
-    @Override
-    public FormattedSearchResult refine(String queryText, String refineTransformer, String format, String locale, Collection<String> fields) throws SearchServiceException {
-        return searchNrefine(queryText, null, refineTransformer, format, locale, 0, -1, fields);
-    }
-
-    @Override
-    public FormattedSearchResult searchNrefine(String queryText,
-                                               String searchTransformer, String refineTransformer, String format,
-                                               String locale, int page, int size, Collection<String> fields)  throws SearchServiceException {
-
-
-        //logger.info("searchNrefine > from: " + page + " to:" + size);
-        //TODO check locale
-        FormattedSearchResult formattedSearchResult = null;
-
-        //logger.debug("Search transformer " + searchTransformer);
-        Transformer sTransformer = transformerFactory.getTransformer(searchTransformer, Locale.getDefault());
-        Transformer oldRefineTransformer = transformerFactory.getTransformer("results_openaire_browse", Locale.getDefault());
-
-        //logger.debug("Refine transformer " + refineTransformer);
-        //Transformer rTranformer = transformerFactory.getTransformer(refineTransformer, Locale.getDefault());
-
-        List<String> refineFields = null;
-        if (fields!=null) {
-            refineFields = new ArrayList<String>(fields);
-        }
-        SearchResult searchResult = newSearch(queryText, locale, refineFields, new ArrayList<String>(), page, size, format, sTransformer, oldRefineTransformer, true);
-
-        Formatter formatter = transformerFactory.getFormatter(format); // formatter cannot be returned as null
-        try {
-            formattedSearchResult = new FormattedSearchResult(formatter.format(searchResult), searchResult.getTotal());
-
-        } catch (Exception e) {
-            logger.error("Error formating search results.", e);
-        }
-
-        return formattedSearchResult;
-    }
-
-
-    public SearchResult newSearch (String text, String locale, List<String> refinefields, List<String> fieldQueries,
-                                   int from, int to, String format, Transformer transformer, Transformer oldRefineTransformer,
-                                   boolean oldPaging) throws SearchServiceException {
-        logger.info("newSearch > from: " + from + " to:" + to);
-        long startTime = System.nanoTime();
-
-        Timer.Sample timer = Timer.start(registry);
-
-        IndexService index = getIndexLocator().getService();
-
-        EPR epr = null;
-        ResultSet<String> rs = null;
-
-        List<String> browseResults = null;
-        List<String> searchResults = null;
-
-        String query = rewrite(text);
-        enhanceFieldQueries(fieldQueries);
-        logger.info("Performing query " + query + "' and fields " + fieldQueries + " and refine " + refinefields);
-
-        try {
-            //TODO see parser and maybe delete!
-            //query = new CQLParser().parse(query).toCQL();
-            String eprQuery = createEprQuery(query, refinefields, fieldQueries);
-
-            epr = index.getBrowsingStatistics(eprQuery, "all", mdFormat, indexLayout);
-
-            if (epr == null){
-                throw new SearchServiceException("Something really strange happened there! Index returned null result set id.");
-            }
-
-            //get the locale TODO do we need this?
-            //String correctLocale = getCorrectLocale(locale);
-            //StringTokenizer tokenizer = new StringTokenizer(correctLocale, "_");
-            //Locale requestLocale = new Locale(tokenizer.nextToken(), tokenizer.nextToken());
-
-            rs = rsFactory.createResultSet(epr);
-
-
-            Map<String, List<String>> list = null;
-            if (oldPaging) {
-                list = ((SolrResultSet)rs).newGet(from-1, to, format, transformer, oldRefineTransformer);
-
-            } else {
-                list = ((SolrResultSet)rs).newGet(from, to, format, transformer, oldRefineTransformer);
-            }
-
-            searchResults = list.get("search");
-            browseResults = list.get("refine");
-
-        } catch (IndexServiceException ise) {
-            logger.error("Error getting refine results.", ise);
-            throw new SearchServiceException("Error getting refine results.", ise);
-
-        } finally {
-            timer.stop(registry.timer("search.server.response.duration"));
-/*
-            histogram.observe(System.currentTimeMillis()-startTime);
-*/
-        }
-
-        long estimatedTime = System.nanoTime() - startTime;
-
-        logger.debug("Search time " + estimatedTime/1000000 +  " milliseconds for query " + query +
-                " and fields " + fieldQueries + " and refine " + refinefields + " from: "+ from + " and size " + to);
-
-        //logger.info("Returned results for NEW search query '" + query + "' and fields " + fieldQueries + " and refine " + refinefields);;
-        rs.close();
-
-        return new SearchResult(query, Locale.getDefault().toString(), rs.size(), from, to, searchResults, browseResults, refinefields);
-    }
-
-    public void cursorSearch(String text, List<String> refinefields, List<String> fieldQueries,
-                             String format, Transformer transformer, OutputStream os) throws SearchServiceException {
-
-        long startTime = System.nanoTime();
-
-        IndexService index = getIndexLocator().getService();
-
-
-        EPR epr = null;
-        ResultSet<String> rs = null;
-
-        String query = rewrite(text);
-        enhanceFieldQueries(fieldQueries);
-        logger.info("Performing cursor query " + query + "' and fields " + fieldQueries + " and refine " + refinefields);
-        logger.debug("Performing cursor query " + query + "' and fields " + fieldQueries + " and refine " + refinefields);
-
-
-        try {
-            String eprQuery = createEprQuery(query, refinefields, fieldQueries);
-            epr = index.getBrowsingStatistics(eprQuery, "all", mdFormat, indexLayout);
-
-            if (epr == null) {
-                throw new SearchServiceException("Something really strange happened there! Index returned null result set id.");
-            }
-
-            rs = rsFactory.createResultSet(epr);
-
-            ((SolrResultSet)rs).cursorGet(transformer,os);
-
-        } catch (IndexServiceException ise) {
-            logger.error("Error getting cursor results.", ise);
-            throw new SearchServiceException("Error getting cursor results.", ise);
-
-        } catch (SolrServerException sse) {
-            logger.error("Error getting cursor results.", sse);
-            throw new SearchServiceException("Error getting cursor results.", sse);
-        }
-
-        long estimatedTime = System.nanoTime() - startTime;
-        logger.debug("Cursor search time " + estimatedTime/1000000 +  " milliseconds for query " + query +
-                " and fields " + fieldQueries + " and refine " + refinefields);
-
-        rs.close();
-    }
-
-
-    private String rewrite(String query) {
-        if (queryRules != null) {
-            for (QueryRewriteRule queryRule: queryRules) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("Apply rule " + query);
-                }
-                query = queryRule.apply(query);
-                if (logger.isDebugEnabled()) {
-                    logger.debug("Rewritten query is " + query);
-                }
-            }
-        }
-        return query;
-    }
-
-    private void enhanceFieldQueries(List<String> fieldQueries) {
-        if (fieldQueries != null && fieldQueryRules != null && !fieldQueryRules.isEmpty()) {
-            fieldQueries.addAll(fieldQueryRules);
-        }
-    }
-
-    public void setFieldRules(Collection<FieldRewriteRule> fieldRules) {
-        this.fieldRules = new HashMap<String, FieldRewriteRule>();
-        for (FieldRewriteRule rule : fieldRules) {
-            String key = rule.getFieldName();
-            if (this.fieldRules.containsKey(key)) {
-                logger.warn("Multiple rules for field " + key);
-                logger.warn("Keeping last rule " + rule.getName());
-            }
-            this.fieldRules.put(key, rule);
-        }
-    }
-
-    public static String createEprQuery(String query, List<String> refineFields, List<String> fieldQueries) {
-        StringBuffer queryBuffer = new StringBuffer();
-        queryBuffer.append("query=");
-
-        StringBuffer facetsBuffer = new StringBuffer();
-        facetsBuffer.append("&groupby=");
-
-        StringBuffer fqBuffer = new StringBuffer();
-        fqBuffer.append("&fq=");
-
-        if (query != null) { //TODO consider exception?
-            queryBuffer.append(query);
-        }
-
-        if(refineFields != null) {
-            for (Iterator<String> iterator = refineFields.iterator(); iterator.hasNext(); ) {
-                facetsBuffer.append(iterator.next());
-                if (iterator.hasNext()) {
-                    facetsBuffer.append(",");
-                }
-            }
-        }
-
-        if(fieldQueries != null) {
-            for (Iterator<String> iterator = fieldQueries.iterator(); iterator.hasNext(); ) {
-                fqBuffer.append(iterator.next());
-                if (iterator.hasNext()) {
-                    fqBuffer.append(",");
-                }
-            }
-        }
-
-        return queryBuffer.append(facetsBuffer.toString()).append(fqBuffer.toString()).toString();
-    }
-
-
-    //TODO: I wish to remove this. This was only made (quick and dirty - only the enhanceFieldQueries(fieldQueries) is missing
-    //from newSearch() after a last time request for the portal to show all the publications and the deletedbyinference ones.
-    //I did not want to pass a parameter since I do not know if we are going to keep it. This is for a tech meeting showcase.
-    //If we want to keep this I need to redesign.
-
-    public SearchResult newSearchWithoutFieldQueries (String text, String locale, List<String> refinefields, List<String> fieldQueries,
-                                                      int from, int to, String format, Transformer transformer, Transformer oldRefineTransformer,
-                                                      boolean oldPaging) throws SearchServiceException {
-        logger.info("non filtered search for...  > from: " + from + " to:" + to);
-        long startTime = System.nanoTime();
-
-        IndexService index = getIndexLocator().getService();
-
-        EPR epr = null;
-        ResultSet<String> rs = null;
-
-        List<String> browseResults = null;
-        List<String> searchResults = null;
-
-        String query = rewrite(text);
-        logger.info("Performing query " + query + "' and fields " + fieldQueries + " and refine " + refinefields);
-
-        try {
-            //TODO see parser and maybe delete!
-            //query = new CQLParser().parse(query).toCQL();
-            String eprQuery = createEprQuery(query, refinefields, fieldQueries);
-
-            epr = index.getBrowsingStatistics(eprQuery, "all", mdFormat, indexLayout);
-
-            if (epr == null) {
-                throw new SearchServiceException("Something really strange happened there! Index returned null result set id.");
-            }
-
-            //get the locale TODO do we need this?
-            //String correctLocale = getCorrectLocale(locale);
-            //StringTokenizer tokenizer = new StringTokenizer(correctLocale, "_");
-            //Locale requestLocale = new Locale(tokenizer.nextToken(), tokenizer.nextToken());
-
-            rs = rsFactory.createResultSet(epr);
-
-            Map<String, List<String>> list = null;
-            if (oldPaging) {
-                list = ((SolrResultSet)rs).newGet(from-1, to, format, transformer, oldRefineTransformer);
-
-            } else {
-                list = ((SolrResultSet)rs).newGet(from, to, format, transformer, oldRefineTransformer);
-            }
-
-
-            searchResults = list.get("search");
-            browseResults = list.get("refine");
-
-        } catch (IndexServiceException ise) {
-            logger.error("Error getting refine results.", ise);
-            throw new SearchServiceException("Error getting refine results.", ise);
-
-        }
-
-        long estimatedTime = System.nanoTime() - startTime;
-        logger.debug("Search time " + estimatedTime/1000000 +  " milliseconds for query " + query +
-                " and fields " + fieldQueries + " and refine " + refinefields + " from: "+ from + " and size " + to);
-
-        //logger.info("Returned results for NEW search query '" + query + "' and fields " + fieldQueries + " and refine " + refinefields);;
-        rs.close();
-        return new SearchResult(query, Locale.getDefault().toString(), rs.size(), from, to, searchResults, browseResults, refinefields);
-    }
-
-
-    public String getMdFormat() {
-        return mdFormat;
-    }
-
-    public void setMdFormat(String mdFormat) {
-        this.mdFormat = mdFormat;
-    }
-
-    public ServiceLocator<IndexService> getIndexLocator() {
-        return indexLocator;
-    }
-
-    public void setIndexLocator(ServiceLocator<IndexService> indexLocator) {
-        this.indexLocator = indexLocator;
-    }
-
-    public ResultSetFactory getRsFactory() {
-        return rsFactory;
-    }
-
-    public void setRsFactory(ResultSetFactory rsFactory) {
-        this.rsFactory = rsFactory;
-    }
-
-    public Collection<FieldRewriteRule> getFieldRules() {
-        return fieldRules.values();
-    }
-
-    public List<QueryRewriteRule> getQueryRules() {
-        return queryRules;
-    }
-
-    public void setQueryRules(List<QueryRewriteRule> queryRules) {
-        this.queryRules = queryRules;
-    }
-
-    public boolean isEnableBrowseCache() {
-        return enableBrowseCache;
-    }
-
-    public void setEnableBrowseCache(boolean enableBrowseCache) {
-        this.enableBrowseCache = enableBrowseCache;
-    }
-
-    public SearchRegistry getTransformerFactory() {
-        return transformerFactory;
-    }
-
-    public void setTransformerFactory(SearchRegistry transformerFactory) { this.transformerFactory = transformerFactory; }
-
-    public String getIndexLayout() {
-        return indexLayout;
-    }
-
-    public void setIndexLayout(String indexLayout) {
-        this.indexLayout = indexLayout;
-    }
-
-    public SearchServiceBlackboardHandler getBlackboardNotificationHandler() {
-        return blackboardNotificationHandler;
-    }
-
-    public void setBlackboardNotificationHandler(SearchServiceBlackboardHandler blackboardNotificationHandler) {
-        this.blackboardNotificationHandler = blackboardNotificationHandler;
-    }
-
-    public void setLookUpServiceServiceLocator(ServiceLocator<ISLookUpService> lookUpServiceServiceLocator) {
-        this.lookUpServiceServiceLocator = lookUpServiceServiceLocator;
-    }
-
-    public List<String> getFieldQueryRules() {
-        return fieldQueryRules;
-    }
-
-    public void setFieldQueryRules(List<String> fieldQueryRules) {
-        this.fieldQueryRules = fieldQueryRules;
-    }
-}
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/app/SearchServiceBlackboardHandler.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/app/SearchServiceBlackboardHandler.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/app/SearchServiceBlackboardHandler.java	(nonexistent)
@@ -1,158 +0,0 @@
-package eu.dnetlib.data.search.app;
-
-import eu.dnetlib.api.enabling.ISLookUpService;
-import eu.dnetlib.api.enabling.ISRegistryService;
-import eu.dnetlib.enabling.tools.blackboard.BlackboardJob;
-import eu.dnetlib.enabling.tools.blackboard.BlackboardNotificationHandler;
-import eu.dnetlib.enabling.tools.blackboard.BlackboardServerHandler;
-import gr.uoa.di.driver.util.ServiceLocator;
-import org.apache.log4j.Logger;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.xpath.*;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-
-public class SearchServiceBlackboardHandler extends
-        BlackboardNotificationHandler<BlackboardServerHandler> {
-
-    private static Logger logger = Logger.getLogger(SearchServiceBlackboardHandler.class);
-
-    private SearchServiceImpl searchService = null;
-    private ServiceLocator<ISLookUpService> lookUpServiceServiceLocator = null;
-    private ServiceLocator<ISRegistryService> registryServiceServiceLocator = null;
-
-    private XPathExpression indexMdFormatExpression = null;
-    private XPathExpression indexLayoutExpression = null;
-    private XPathExpression searchMdFormatExpression = null;
-
-
-    public SearchServiceBlackboardHandler() throws XPathExpressionException {
-        XPathFactory factory = XPathFactory.newInstance();
-        XPath xpath = factory.newXPath();
-
-        indexMdFormatExpression = xpath.compile("//METADATA_FORMAT");
-        indexLayoutExpression = xpath.compile("//METADATA_FORMAT_LAYOUT");
-        searchMdFormatExpression = xpath.compile("//SERVICE_PROPERTIES/PROPERTY[@key='mdformat']");
-    }
-
-    @Override
-    protected void processJob(BlackboardJob job) {
-        logger.info("Got Blackboard Message");
-        String action = job.getAction();
-
-        try {
-            getBlackboardHandler().ongoing(job);
-
-            if (action.equals("UpdateIndex")) {
-                String indexProfileId = job.getParameters().get("IndexId");
-                logger.info("Updating the service to use index " + indexProfileId);
-
-                String indexProfile = lookUpServiceServiceLocator.getService().getResourceProfile(indexProfileId);
-                String mdFormat = getMDFormat(indexProfile);
-                String indexLayout = getIndexLayout(indexProfile);
-                logger.info("New mdFormat: " + mdFormat + ", new layout: " + indexLayout);
-
-                searchService.setMdFormat(mdFormat);
-                searchService.setIndexLayout(indexLayout);
-
-                String searchProfileId = searchService.getServiceEPR().getParameter("serviceId");
-
-                updateSearchServiceProfile(searchProfileId, mdFormat);
-
-            } else {
-                throw new Exception("Don't know what to do with " + action);
-            }
-
-            getBlackboardHandler().done(job);
-        } catch (Exception e) {
-            getBlackboardHandler().failed(job, e);
-
-            logger.error("Error processing job", e);
-        }
-    }
-
-    private String getIndexLayout(String indexProfile) throws ParserConfigurationException, IOException, SAXException, XPathExpressionException {
-        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-        dbf.setNamespaceAware(true);
-        DocumentBuilder db = dbf.newDocumentBuilder();
-        Document doc = db.parse(new InputSource(new StringReader(indexProfile)));
-
-        Node layoutNode = (Node) indexLayoutExpression.evaluate(doc, XPathConstants.NODE);
-
-        return layoutNode.getTextContent();
-    }
-
-    private String getMDFormat(String indexProfile) throws ParserConfigurationException, IOException, SAXException, XPathExpressionException {
-        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-        dbf.setNamespaceAware(true);
-        DocumentBuilder db = dbf.newDocumentBuilder();
-        Document doc = db.parse(new InputSource(new StringReader(indexProfile)));
-
-        Node layoutNode = (Node) indexMdFormatExpression.evaluate(doc, XPathConstants.NODE);
-
-        return layoutNode.getTextContent();
-    }
-
-    private void updateSearchServiceProfile(String searchProfileId, String mdFormat)  {
-        try {
-            String searchProfile = lookUpServiceServiceLocator.getService().getResourceProfile(searchProfileId);
-
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setNamespaceAware(true);
-            DocumentBuilder db = dbf.newDocumentBuilder();
-            Document doc = db.parse(new InputSource(new StringReader(searchProfile)));
-
-
-            Node node = (Node) searchMdFormatExpression.evaluate(doc,XPathConstants.NODE);
-            node.getAttributes().getNamedItem("value").setNodeValue(mdFormat);
-
-            DOMSource domSource = new DOMSource(doc);
-            StringWriter writer = new StringWriter();
-            StreamResult result = new StreamResult(writer);
-            TransformerFactory tf = TransformerFactory.newInstance();
-            Transformer transformer = tf.newTransformer();
-            transformer.transform(domSource, result);
-
-            registryServiceServiceLocator.getService().updateProfile(searchProfileId, writer.toString(), "SearchServiceResourceType");
-
-        } catch (Exception e) {
-            logger.error("Fail to update search service profile with id " + searchProfileId, e);
-        }
-
-        logger.info("Updated search service profile with id " +searchProfileId);
-
-    }
-
-
-    public ServiceLocator<ISLookUpService> getLookUpServiceServiceLocator() {
-        return lookUpServiceServiceLocator;
-    }
-
-    public void setLookUpServiceServiceLocator(ServiceLocator<ISLookUpService> lookUpServiceServiceLocator) {
-        this.lookUpServiceServiceLocator = lookUpServiceServiceLocator;
-    }
-
-    public void setRegistryServiceServiceLocator(ServiceLocator<ISRegistryService> registryServiceServiceLocator) {
-        this.registryServiceServiceLocator = registryServiceServiceLocator;
-    }
-
-    public SearchServiceImpl getSearchService() {
-        return searchService;
-    }
-
-    public void setSearchService(SearchServiceImpl searchService) {
-        this.searchService = searchService;
-    }
-}
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/app/plan/Query.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/app/plan/Query.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/app/plan/Query.java	(nonexistent)
@@ -1,60 +0,0 @@
-/**
- * 
- */
-package eu.dnetlib.data.search.app.plan;
-
-import org.apache.log4j.Logger;
-
-
-
-/**
- * @author stoumpos
- *
- */
-
-//TODO: consider removing
-public class Query {
-
-	private String text = null;
-	private String query = null;
-	
-	private Logger logger = Logger.getLogger(Query.class);
-	
-	public Query(String text) {
-		this.setText(text);
-	}
-	
-	public void setText(String text) {
-		logger.debug("Setting text: " + text);
-		this.text = text;
-	//	this.query = Cql.parse(text);
-	}
-	
-	public String getText() {
-		return text;
-	}
-
-	public String getCqlQuery() {
-		return query;
-	}
-	
-	@Override
-	public boolean equals(Object obj) {
-		
-		if (obj instanceof Query) {
-			return text.equals(((Query) obj).text);
-		} else {
-			return false;
-		}
-	}
-
-	@Override
-	public int hashCode() {
-		return text.hashCode();
-	}
-
-	@Override
-	public String toString() {
-		return text;
-	}
-}

Property changes on: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/app/plan/Query.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/app/plan/CollectionRewriteRule.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/app/plan/CollectionRewriteRule.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/app/plan/CollectionRewriteRule.java	(nonexistent)
@@ -1,55 +0,0 @@
-package eu.dnetlib.data.search.app.plan;
-
-import eu.dnetlib.domain.functionality.Collection;
-import gr.uoa.di.driver.enabling.ISLookUp;
-import org.apache.log4j.Logger;
-
-public class CollectionRewriteRule extends FieldRewriteRule {
-
-	public static Logger logger = Logger.getLogger(QueryRewriteRule.class);
-	
-	private ISLookUp<Collection> collectionLookUp = null;
-	
-	public CollectionRewriteRule() {
-		super(null, null);
-	}
-	
-	public CollectionRewriteRule(String name, String fieldName) {
-		super(name, fieldName);
-	}
-
-	public ISLookUp<Collection> getCollectionLookUp() {
-		return collectionLookUp;
-	}
-
-	public void setCollectionLookUp(
-			ISLookUp<eu.dnetlib.domain.functionality.Collection> collectionLookUp) {
-		this.collectionLookUp = collectionLookUp;
-	}
-	
-/*	@Override
-	public CqlClause apply(CqlRelation relation) throws CqlException {
-		
-		if (!relation.getIndex().equals(fieldName)) {
-			throw new IllegalArgumentException("Rule " + name
-					+ " expects field " + fieldName
-					+ " but is applied on field " + relation.getIndex());
-		}
-		
-		String id = relation.getValue().substring(1, relation.getValue().length()-1);
-		try {
-			Collection collection = getCollectionLookUp().getById(id);
-			if (logger.isDebugEnabled()) {
-				logger.debug("rewrite relation '" + relation.toCqlString()
-						+ "' as '" + collection.getRetrievalCondition() + "'");
-			}
-			
-			Query query = new Query(collection.getRetrievalCondition());
-			return query.getCqlQuery().getRoot();
-			
-		} catch (ISLookUpException e) {
-			throw new CqlException(
-					"Collection lookup for " + id + " failed.", e);
-		}
-	} */
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/app/plan/PrefixRule.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/app/plan/PrefixRule.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/app/plan/PrefixRule.java	(nonexistent)
@@ -1,50 +0,0 @@
-/**
- * 
- */
-package eu.dnetlib.data.search.app.plan;
-
-import org.apache.log4j.Logger;
-
-/**
- * @author stoumpos
- */
-public class PrefixRule extends QueryRewriteRule {
-
-	public static final Logger logger = Logger.getLogger(QueryRewriteRule.class);
-	
-	private String prefix = null;
-	
-	public PrefixRule() {
-		this(null, null);
-	}
-	
-	public PrefixRule(String name, String prefix) {
-		super(name);
-		this.prefix = prefix;
-	}
-	
-	public String getPrefix() {
-		return prefix;
-	}
-
-	public void setPrefix(String prefix) {
-		this.prefix = prefix;
-	}
-
-	/* (non-Javadoc)
-	 * @see eu.dnetlib.data.search.app.plan.RewriteRule#apply(eu.dnetlib.data.search.app.plan.Query)
-	 */
-	public String apply(String query)  {
-		String rewritten = query;
-		
-		StringBuffer sb = new StringBuffer(prefix);
-		sb.append(" AND ").append(query);
-		if (logger.isDebugEnabled()) {
-			logger.debug("rewrite query '" + query
-					+ "' as '" + sb.toString() + "'");
-		}
-
-       rewritten = sb.toString();
-		return rewritten;
-	}
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/app/plan/FieldRewriteRule.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/app/plan/FieldRewriteRule.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/app/plan/FieldRewriteRule.java	(nonexistent)
@@ -1,37 +0,0 @@
-package eu.dnetlib.data.search.app.plan;
-
-/**
- */
-public abstract class FieldRewriteRule {
-
-	protected String name = null;
-	protected String fieldName = null;
-	
-	public FieldRewriteRule(String name, String fieldName) {
-		this.name = name;
-		this.fieldName = fieldName;
-	}
-	
-	public String getFieldName() {
-		return fieldName;
-	}
-	
-	public void setFieldName(String fieldName) {
-		this.fieldName = fieldName;
-	}
-	
-	public String getName() {
-		return name;
-	}
-	
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	//public abstract CqlClause apply(CqlRelation relation) throws CqlException;
-	
-	@Override
-	public String toString() {
-		return name;
-	}
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/app/plan/QueryRewriteRule.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/app/plan/QueryRewriteRule.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/app/plan/QueryRewriteRule.java	(nonexistent)
@@ -1,31 +0,0 @@
-package eu.dnetlib.data.search.app.plan;
-
-/**
- */
-public abstract class QueryRewriteRule {
-
-	protected String name = null;
-	
-	public QueryRewriteRule(String name) {
-		this.name = name;
-	}
-	
-	public QueryRewriteRule() {
-		this("");
-	}
-	
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public abstract String apply(String query);
-	
-	@Override
-	public String toString() {
-		return "'"+name+"'";
-	}
-}

Property changes on: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/app/plan/QueryRewriteRule.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/VocabularyFactory.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/VocabularyFactory.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/VocabularyFactory.java	(nonexistent)
@@ -1,12 +0,0 @@
-package eu.dnetlib.data.search.utils.vocabulary;
-
-public interface VocabularyFactory {
-	
-	/**
-	 * Creates an xml vocabulary file
-	 * @param vocabularyName The name of the vocabulary
-	 * @return the path of the vocabulary
-	 */
-	String createXmlVocabulary(String vocabularyName);
-
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/IndexVocabulary.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/IndexVocabulary.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/IndexVocabulary.java	(nonexistent)
@@ -1,28 +0,0 @@
-package eu.dnetlib.data.search.utils.vocabulary;
-
-import eu.dnetlib.data.search.transform.Transformer;
-
-@Deprecated
-public class IndexVocabulary extends Vocabulary {
-	
-	/** the query that must be executed */
-	private final String query;
-	
-	/** the name of the {@link Transformer} to be applied */
-	private final String transformer;
-	
-	
-	public IndexVocabulary(String name, String query, String transformer) {
-		super(name);
-		this.query = query;
-		this.transformer = transformer;
-	}
-	
-	public String getQuery() {
-		return query;
-	}
-	
-	public String getTransformer() {
-		return transformer;
-	}
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/VocabularyFactoryImpl.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/VocabularyFactoryImpl.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/VocabularyFactoryImpl.java	(nonexistent)
@@ -1,10 +0,0 @@
-package eu.dnetlib.data.search.utils.vocabulary;
-
-
-public class VocabularyFactoryImpl {
-
-	public static void createXmlVocabulary(Vocabulary vocabulary) {
-
-	}
-	
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/VocabularyManager.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/VocabularyManager.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/VocabularyManager.java	(nonexistent)
@@ -1,22 +0,0 @@
-package eu.dnetlib.data.search.utils.vocabulary;
-
-import eu.dnetlib.domain.enabling.Vocabulary;
-
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
-
-public interface VocabularyManager {
-	
-	/**
-	 * Returns the path where the requested vocabulary is
-	 * @param vocabularyName The name of the vocabulary
-	 * @param locale the locale
-	 * @return the path where the requested vocabulary is
-	 */
-	Vocabulary getVocabulary(String vocabularyName, Locale locale);
-	Vocabulary getVocabulary(String vocabularyName, Locale locale, boolean loadanyway);
-	String translate(String n, String l, String e, String d);
-	Set<String> getVocabularyNames();
-	List<Locale> getLocales();
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/LocalVocabulary.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/LocalVocabulary.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/LocalVocabulary.java	(nonexistent)
@@ -1,16 +0,0 @@
-package eu.dnetlib.data.search.utils.vocabulary;
-
-public class LocalVocabulary extends Vocabulary{
-	
-	/** the name of the vocabulary in classpath */
-	private final String fileName;
-
-	public LocalVocabulary(String name, String filename) {
-		super(name);
-		this.fileName = filename;
-	}
-	
-	public String getFileName() {
-		return fileName;
-	}
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/VocabularyManagerWrapper.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/VocabularyManagerWrapper.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/VocabularyManagerWrapper.java	(nonexistent)
@@ -1,23 +0,0 @@
-package eu.dnetlib.data.search.utils.vocabulary;
-
-import java.util.Locale;
-
-public class VocabularyManagerWrapper {
-	private static VocabularyManager vocabularyManager;
-	
-	public static VocabularyManager getVocabularyManager() {
-		return vocabularyManager;
-	}
-
-	public void setVocabularyManager(VocabularyManager vocabularyManager) {
-		VocabularyManagerWrapper.vocabularyManager = vocabularyManager;
-	}
-
-	public static eu.dnetlib.domain.enabling.Vocabulary getVocabulary(String vocabularyName, Locale locale){ 
-		return vocabularyManager.getVocabulary(vocabularyName, locale);
-	}
-	
-	public static String translate(String name, String locale, String encoding, String defaultValue){
-		return vocabularyManager.translate(name, locale, encoding, defaultValue);
-	}
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/ISVocabulary.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/ISVocabulary.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/ISVocabulary.java	(nonexistent)
@@ -1,17 +0,0 @@
-package eu.dnetlib.data.search.utils.vocabulary;
-
-public class ISVocabulary extends Vocabulary {
-
-	/** the name of the vocabulary in IS */
-	private final String resourceName;
-
-	public ISVocabulary(String name, String resourceName) {
-		super(name);
-		this.resourceName = resourceName;
-	}
-	
-	public String getResourceName() {
-		return resourceName;
-	}
-
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/VocabularyManagerImpl.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/VocabularyManagerImpl.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/VocabularyManagerImpl.java	(nonexistent)
@@ -1,224 +0,0 @@
-package eu.dnetlib.data.search.utils.vocabulary;
-
-import eu.dnetlib.data.search.transform.config.Configuration;
-import org.apache.log4j.Logger;
-
-import java.util.*;
-
-public class VocabularyManagerImpl implements VocabularyManager {
-	
-	private Configuration config = null;
-	
-	//key-> vocabulary name, value-> vocabulary loader
-	private Map<String, VocabularyLoader> vocabularyLoaderMap = new HashMap<String, VocabularyLoader>();
-
-	private Map<String, String> underCreation = new HashMap<String, String>();
-	//key-> vocabulary name, value-> vocabulary item
-	//this vocabulary class contains the  fields needed to load the domain.Vocab object
-	private Map<String, Vocabulary> vocabularyMap = new HashMap<String, Vocabulary>();
-	
-	//key-> vocabulary name, value-> vocabulary object per locale
-	private Map<String, Map<Locale, eu.dnetlib.domain.enabling.Vocabulary>> pathMap = new HashMap<String, Map<Locale, eu.dnetlib.domain.enabling.Vocabulary>>();
-	
-	private List<String> indexVocabularies = new ArrayList<String>();
-	
-	private ISVocabularyLoader isVocabularyLoader;
-	private IndexVocabularyLoader indexVocabularyLoader;	
-	private LocalVocabularyLoader localVocabularyLoader;
-	
-	private static Logger logger = Logger.getLogger(VocabularyManagerImpl.class);
-	
-	public void init() {
-		for(String vocabularyName: config.getIsVocabularyMap().keySet()) {
-			vocabularyLoaderMap.put(vocabularyName, isVocabularyLoader);
-			vocabularyMap.put(vocabularyName, config.getIsVocabularyMap().get(vocabularyName));
-		}
-		
-		for(String vocabularyName: config.getIndexVocabularyMap().keySet()) {
-			vocabularyLoaderMap.put(vocabularyName, indexVocabularyLoader);	
-			vocabularyMap.put(vocabularyName, config.getIndexVocabularyMap().get(vocabularyName));
-			
-			indexVocabularies.add(vocabularyName);
-		}
-
-		for(String vocabularyName: config.getLocalVocabularyMap().keySet()) {
-			vocabularyLoaderMap.put(vocabularyName, localVocabularyLoader);	
-			vocabularyMap.put(vocabularyName, config.getLocalVocabularyMap().get(vocabularyName));
-		}
-
-	}
-	
-	public String translate(String name, String l, String encoding, String default_value){
-		Locale locale = new Locale(l);
-		eu.dnetlib.domain.enabling.Vocabulary vocabulary = getVocabulary(name, locale);
-
-		if(vocabulary == null) {
-			return (default_value.length() == 0)? encoding: default_value;
-		}
-		String term = vocabulary.getEnglishName(encoding);
-
-		if(term != null && !term.trim().isEmpty()) {
-			return term;
-		}
-		
-		vocabulary = getVocabulary(name, config.getDefaultLocale());
-
-		if(vocabulary == null) {
-			return (default_value.length() == 0)? encoding: default_value;
-		}
-
-		term = vocabulary.getEnglishName(encoding);
-
-		if(term != null && !term.trim().isEmpty()){
-			return term;
-		}
-
-		return (default_value.length() == 0)? encoding: default_value;
-	}
-	
-	public eu.dnetlib.domain.enabling.Vocabulary getVocabulary(String vocabularyName, Locale locale) {
-		eu.dnetlib.domain.enabling.Vocabulary myVocabulary = null;
-		
-		//if vocabulary loader does not exist, return null
-		VocabularyLoader vocabularyLoader = vocabularyLoaderMap.get(vocabularyName);
-		if (vocabularyLoader == null) {
-			return null;
-		}
-		
-		//if locale is not in the configuration file, change it with the default
-		if (!config.getLocales().contains(locale)) {
-			locale = config.getDefaultLocale();
-		}
-		
-		//if it is an index vocabulary use the default locale only!
-		if (indexVocabularies.contains(vocabularyName)) {
-			locale = config.getDefaultLocale();
-		}
-		
-		//if vocabulary does not exist, return null
-		Vocabulary vocabulary = vocabularyMap.get(vocabularyName);
-		if (vocabulary == null) {
-			return null;
-		}
-		
-		Map<Locale, eu.dnetlib.domain.enabling.Vocabulary> localePathMap = pathMap.get(vocabularyName);
-		
-		try {
-			if (localePathMap == null) {
-				localePathMap = new HashMap<Locale, eu.dnetlib.domain.enabling.Vocabulary>();
-			}
-			if (underCreation.get(vocabularyName+locale) == null) { //first time to load the vocabulary
-				underCreation.put(vocabularyName+locale,"");
-				myVocabulary = vocabularyLoader.loadVocabulary(vocabulary, locale);
-
-				localePathMap.put(locale, myVocabulary);
-				pathMap.put(vocabularyName, localePathMap);
-			
-			} else {
-				myVocabulary = localePathMap.get(locale);
-				if (myVocabulary == null && underCreation.get(vocabularyName + locale) == null) { //first time to load the vocabulary for this locale
-					underCreation.put(vocabularyName+locale,"");
-					myVocabulary = vocabularyLoader.loadVocabulary(vocabulary, locale);
-					localePathMap.put(locale, myVocabulary);
-				}
-			}
-			
-		} catch (Exception e) {
-			logger.error("Cannot load vocabulary " + vocabularyName + locale, e);
-
-		} finally {
-			if (underCreation.get(vocabularyName+locale) != null && !underCreation.get(vocabularyName+locale).isEmpty()) {
-				underCreation.put(vocabularyName+locale, null);
-			}
-		}
-
-		//logger.info("Vocabulary " + vocabularyName + locale + " was created");
-
-		return myVocabulary;
-	}
-	
-	public eu.dnetlib.domain.enabling.Vocabulary getVocabulary(String vocabularyName, Locale locale, boolean loadanyway) {
-		eu.dnetlib.domain.enabling.Vocabulary myVocabulary = null;
-		
-		//if vocabulary loader does not exist, return null
-		VocabularyLoader vocabularyLoader = vocabularyLoaderMap.get(vocabularyName);
-		if (vocabularyLoader == null) {
-			return null;
-		}
-		
-		//if locale is not in the configuration file, change it with the default
-		if (!config.getLocales().contains(locale)) {
-			locale = config.getDefaultLocale();
-		}
-		
-		//if it is an index vocabulary use the default locale only!
-		if (indexVocabularies.contains(vocabularyName)) {
-			locale = config.getDefaultLocale();
-		}
-		
-		//if vocabulary does not exist, return null
-		Vocabulary vocabulary = vocabularyMap.get(vocabularyName);
-        //logger.debug("vocabulary map " + vocabularyMap.keySet());
-        //logger.debug("loading vocabulary " + vocabularyName);
-        //logger.debug("vocabulary " + vocabulary);
-
-		if (vocabulary == null) {
-			return null;
-		}
-		
-		Map<Locale, eu.dnetlib.domain.enabling.Vocabulary> localePathMap = pathMap.get(vocabularyName);
-		
-		try {
-			if (localePathMap == null) { //first time to load the vocabulary
-				localePathMap = new HashMap<Locale, eu.dnetlib.domain.enabling.Vocabulary>();				
-				myVocabulary = vocabularyLoader.loadVocabulary(vocabulary, locale);
-				localePathMap.put(locale, myVocabulary);
-				pathMap.put(vocabularyName, localePathMap);
-			
-			} else {
-				myVocabulary = localePathMap.get(locale);
-				
-				if (myVocabulary == null || loadanyway) { //first time to load the vocabulary for this locale, or load anyway
-					myVocabulary = vocabularyLoader.loadVocabulary(vocabulary, locale);
-					localePathMap.put(locale, myVocabulary);
-				}
-			}
-			
-		} catch (Exception e) {
-			logger.error("Cannot load vocabulary " + vocabularyName + " with locale " + locale, e);
-		}
-
-		return myVocabulary;
-	}
-
-	public void setConfig(Configuration config) {
-		this.config = config;
-	}
-
-	public void setIsVocabularyLoader(ISVocabularyLoader isVocabularyLoader) {
-		this.isVocabularyLoader = isVocabularyLoader;
-	}
-
-	public void setIndexVocabularyLoader(IndexVocabularyLoader indexVocabularyLoader) {
-		this.indexVocabularyLoader = indexVocabularyLoader;
-	}
-
-	public void setLocalVocabularyLoader(LocalVocabularyLoader localVocabularyLoader) {
-		this.localVocabularyLoader = localVocabularyLoader;
-	}
-
-	public Map<String, Vocabulary> getVocabulariesMap(){
-		return this.vocabularyMap;
-	}
-	
-	@Override
-	public Set<String> getVocabularyNames() {
-		return this.vocabularyMap.keySet();
-	}
-
-	@Override
-	public List<Locale> getLocales(){
-		return this.config.getLocales();
-	}
-	
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/IndexVocabularyLoader.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/IndexVocabularyLoader.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/IndexVocabularyLoader.java	(nonexistent)
@@ -1,93 +0,0 @@
-package eu.dnetlib.data.search.utils.vocabulary;
-
-import eu.dnetlib.api.data.SearchService;
-import eu.dnetlib.api.data.SearchServiceException;
-import eu.dnetlib.domain.data.FormattedSearchResult;
-import gr.uoa.di.driver.util.ServiceLocator;
-import gr.uoa.di.driver.xml.VocabularyXmlConverter;
-import org.apache.log4j.Logger;
-
-import javax.xml.bind.JAXBException;
-import java.util.Locale;
-
-/**
- * Loads vocabulary that is created after a search query. 
- * The vocabulary is created based on the {@link Vocabulary}} transformer. 
- * @author kiatrop
- *
- */
-public class IndexVocabularyLoader extends VocabularyLoader {
-	private ServiceLocator<SearchService> searchServiceLocator = null;
-	
-	//in the case of IS vocabs, the only locale is the default
-	//private String localeCountry = null;
-	//private String localeLanguage = null;
-	
-	//the default number of the results in search request (same as result set)
-	private static final int REQUEST_SIZE = 100;
-
-	private Logger logger = Logger.getLogger(IndexVocabularyLoader.class);
-
-	public String getVocabularyXml(Vocabulary vocabulary, Locale locale) {
-		logger.debug("Getting vocabulary with name " + vocabulary.getName() + " and locale " + locale);
-
-		String xml = null;
-		FormattedSearchResult fsr = null;
-
-		//long time = System.currentTimeMillis();
-		//String stringLocale = locale.getLanguage() + "_" + locale.getCountry();
-
-		try {
-			fsr = searchServiceLocator.getService().search(
-					((IndexVocabulary)vocabulary).getQuery(),
-					((IndexVocabulary)vocabulary).getTransformer(),
-					"vocabulary", null, 1, REQUEST_SIZE);
-
-			int totalResultNumber = fsr.getResultsNumber();
-
-			//make sure that every result is loaded
-			if (totalResultNumber > REQUEST_SIZE ) {
-				fsr = searchServiceLocator.getService().search(
-						((IndexVocabulary)vocabulary).getQuery(),
-						((IndexVocabulary)vocabulary).getTransformer(),
-						"vocabulary", null, 1, totalResultNumber);
-			}
-
-			xml = fsr.getFormattedResult();
-
-		} catch (SearchServiceException sse) {
-			logger.error("Error getting Vocabulary xml", sse);
-		}
-
-		//time = System.currentTimeMillis() - time;
-		//System.out.println("old Vocabulary creation took " + time);
-
-
-		return xml;
-	}
-
-	public ServiceLocator<SearchService> getSearchServiceLocator() {
-		return searchServiceLocator;
-	}
-
-	public void setSearchServiceLocator(
-			ServiceLocator<SearchService> searchServiceLocator) {
-		this.searchServiceLocator = searchServiceLocator;
-	}
-
-	@Override
-	protected eu.dnetlib.domain.enabling.Vocabulary getVocabulary(Vocabulary vocabulary, Locale locale) {
-
-		String xml = getVocabularyXml(vocabulary, locale);
-		VocabularyXmlConverter converter = null;
-		try {
-			converter = new VocabularyXmlConverter();
-			return converter.XmlToObject(xml);
-
-		} catch (JAXBException jaxbe) {
-			logger.error("Fail to create vocabulary " + vocabulary.getName(), jaxbe);
-			return null;
-		}
-	}
-}
- 
\ No newline at end of file
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/Vocabulary.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/Vocabulary.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/Vocabulary.java	(nonexistent)
@@ -1,14 +0,0 @@
-package eu.dnetlib.data.search.utils.vocabulary;
-
-public abstract class Vocabulary {
-
-	private final String name;
-
-	public String getName() {
-		return name;
-	}
-	
-	public Vocabulary(String name) {
-		this.name = name;
-	}
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/LocalVocabularyLoader.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/LocalVocabularyLoader.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/LocalVocabularyLoader.java	(nonexistent)
@@ -1,65 +0,0 @@
-package eu.dnetlib.data.search.utils.vocabulary;
-
-import gr.uoa.di.driver.xml.VocabularyXmlConverter;
-import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
-
-import javax.xml.bind.JAXBException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Locale;
-import java.util.StringTokenizer;
-
-/**
- * Loads vocabulary from the classpath
- * @author kiatrop
- *
- */
-public class LocalVocabularyLoader extends VocabularyLoader {
-	
-	private static final Logger logger = Logger.getLogger(LocalVocabularyLoader.class);
-	
-	@Override
-	public eu.dnetlib.domain.enabling.Vocabulary getVocabulary(Vocabulary vocabulary, Locale locale) {
-		logger.debug("Getting vocabulary with name " + vocabulary.getName() + " and locale " + locale);
-		
-		String xml = null;
-		StringTokenizer tokenizer = new StringTokenizer(((LocalVocabulary)vocabulary).getFileName(), ".");
-		String localizedVocabularyName = tokenizer.nextToken() +  "_" +
-				locale.getLanguage() + "_" + locale.getCountry() + "." + tokenizer.nextToken();
-		
-		InputStream xmlInputStream = this.getClass().getClassLoader().getResourceAsStream(localizedVocabularyName);
-		
-		if (xmlInputStream == null) {
-			logger.debug("The " + localizedVocabularyName + " does not exist in classpath. Loading default vocabulary instead.");
-			xmlInputStream = this.getClass().getClassLoader().getResourceAsStream(((LocalVocabulary)vocabulary).getFileName());
-		}
-		
-		if (xmlInputStream == null) {
-			logger.warn("The " + ((LocalVocabulary)vocabulary).getFileName() + " does not exist in classpath.");
-			return null; //null
-		}
-		
-		try {
-			xml = IOUtils.toString(xmlInputStream, "UTF-8");
-
-			if (xml!=null && !xml.trim().isEmpty()) {
-				VocabularyXmlConverter converter = null;
-
-				converter = new VocabularyXmlConverter();
-				return converter.XmlToObject(xml);
-			}
-			
-		} catch (IOException ioe) {
-			logger.debug("Problem loading " + localizedVocabularyName + " from classpath", ioe);
-
-		} catch (JAXBException jaxbe) {
-			logger.error("Unable to load vocabulary " + vocabulary.getName(), jaxbe);
-
-		} finally {
-            IOUtils.closeQuietly(xmlInputStream);
-        }
-
-		return null;
-	}
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/ISVocabularyLoader.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/ISVocabularyLoader.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/ISVocabularyLoader.java	(nonexistent)
@@ -1,59 +0,0 @@
-package eu.dnetlib.data.search.utils.vocabulary;
-
-import eu.dnetlib.domain.enabling.VocabularySearchCriteria;
-import gr.uoa.di.driver.enabling.ISLookUp;
-import gr.uoa.di.driver.enabling.ISLookUpException;
-import org.apache.log4j.Logger;
-
-import java.util.List;
-import java.util.Locale;
-
-public class ISVocabularyLoader extends VocabularyLoader {
-
-	private ISLookUp<eu.dnetlib.domain.enabling.Vocabulary> lookup = null;
-
-	private static Logger logger = Logger.getLogger(ISVocabularyLoader.class);
-
-	@Override
-	public eu.dnetlib.domain.enabling.Vocabulary getVocabulary(Vocabulary vocabulary, Locale locale) {
-		logger.debug("Getting vocabulary with name " + vocabulary.getName() + " and locale " + locale);
-		String localizedResourceName = ((ISVocabulary)vocabulary).getResourceName() + "_" +
-				locale.getLanguage() + "_" + locale.getCountry();
-
-		VocabularySearchCriteria criteria = new VocabularySearchCriteria();
-		criteria.setName(localizedResourceName);
-
-		List<eu.dnetlib.domain.enabling.Vocabulary> list;
-
-
-		try {
-			list = lookup.fetch(criteria);
-
-			if (list.size() > 0) {
-				return list.get(0);
-
-			} else {
-				logger.warn("The " + localizedResourceName + " does not exist in IS. Loading default vocabulary instead.");
-				criteria.setName(((ISVocabulary)vocabulary).getResourceName());
-				list = lookup.fetch(criteria);
-
-				if (list.size() > 0) {
-					return list.get(0);
-				}
-			}
-
-		} catch (ISLookUpException ise) {
-			logger.warn("Problem loading " + vocabulary.getName() + " from IS.", ise);
-		}
-
-		return null;
-	}
-
-	public ISLookUp<eu.dnetlib.domain.enabling.Vocabulary> getLookup() {
-		return lookup;
-	}
-
-	public void setLookup(ISLookUp<eu.dnetlib.domain.enabling.Vocabulary> lookup) {
-		this.lookup = lookup;
-	}
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/VocabularyLoader.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/VocabularyLoader.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/vocabulary/VocabularyLoader.java	(nonexistent)
@@ -1,15 +0,0 @@
-package eu.dnetlib.data.search.utils.vocabulary;
-
-import javax.xml.bind.JAXBException;
-import java.util.Locale;
-
-abstract class VocabularyLoader {
-
-	
-	public eu.dnetlib.domain.enabling.Vocabulary loadVocabulary(Vocabulary vocabulary, Locale locale) throws JAXBException {
-		return  getVocabulary(vocabulary, locale);
-	}
-
-	protected abstract eu.dnetlib.domain.enabling.Vocabulary getVocabulary(Vocabulary vocabulary, Locale locale);
-
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/cql/ParameterQueryEnhancer.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/cql/ParameterQueryEnhancer.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/cql/ParameterQueryEnhancer.java	(nonexistent)
@@ -1,575 +0,0 @@
-package eu.dnetlib.data.search.utils.cql;
-
-import eu.dnetlib.data.search.utils.vocabulary.VocabularyManager;
-import eu.dnetlib.domain.enabling.Vocabulary;
-import org.apache.log4j.Logger;
-
-import javax.servlet.http.HttpServletRequest;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
-/**
- * Created by kiatrop on 10/7/2014.
- */
-public class ParameterQueryEnhancer {
-
-    private static final Logger logger = Logger.getLogger(ParameterQueryEnhancer.class);
-
-    /**
-     * Enhance the given CQL query with FP7 specific index fields
-     */
-    public static void enhanceQueryWithFundingLevelParams(StringBuilder queryBuilder, HttpServletRequest request, VocabularyManager vocabularyManager, boolean isModelSygma) {
-        logger.debug("enhance funding " + isModelSygma);
-        
-        String funder = request.getParameter("funder");
-        String fundingStream = request.getParameter("fundingStream");
-        String FP7scientificArea = request.getParameter("FP7scientificArea");
-
-        if(isModelSygma) {
-            if (funder != null) {
-                if(!funder.equalsIgnoreCase("WT")) {
-                    Vocabulary sygmaFundersVocabulary = vocabularyManager.getVocabulary("sygma_funders", Locale.ROOT);
-                    addExactQueryTerm("relfundinglevel0_id", devocabularizedTerm(funder.toUpperCase(), sygmaFundersVocabulary), queryBuilder);
-                } else {
-                    Vocabulary funderVocabulary = vocabularyManager.getVocabulary("funders_simple", Locale.ROOT);
-                    addExactQueryTerm("relfunderid", devocabularizedTerm(funder.toUpperCase(), funderVocabulary), queryBuilder);
-                }
-            }
-
-            if (fundingStream != null && !fundingStream.trim().isEmpty()) {
-                Vocabulary relfundinglevel1Vocabulary = vocabularyManager.getVocabulary("programmes_simple", Locale.ROOT);
-                addVocabularizedQueryTerm("relfundinglevel1_id", fundingStream.toUpperCase(), relfundinglevel1Vocabulary, queryBuilder);
-            }
-
-            if (FP7scientificArea != null && !FP7scientificArea.trim().isEmpty()) {
-                Vocabulary relfundinglevel2Vocabulary = vocabularyManager.getVocabulary("areas", Locale.ROOT);
-                addVocabularizedQueryTerm("relfundinglevel2_id", FP7scientificArea, relfundinglevel2Vocabulary, queryBuilder);
-            }
-
-        } else {
-
-            if (funder != null) {
-                //Vocabulary funderVocabulary = vocabularyManager.getVocabulary("funders_simple", Locale.ROOT);
-                addExactQueryTerm("relfundershortname", funder.toUpperCase(), queryBuilder);
-            }
-
-            if (fundingStream != null && !fundingStream.trim().isEmpty()) {
-                if(fundingStream.equalsIgnoreCase("FP7") || fundingStream.equalsIgnoreCase("H2020")) {
-                    addORQueryTermExact(new String[]{"relfundinglevel0_name", "relfundinglevel1_name", "relfundinglevel2_name"}, "\"" + fundingStream.toUpperCase() + "\"", queryBuilder);
-                } else {
-                    addORQueryTermExact(new String[]{"relfundinglevel0_name", "relfundinglevel1_name", "relfundinglevel2_name"}, "\"" + fundingStream + "\"", queryBuilder);
-                }
-            }
-
-            if (FP7scientificArea != null && !FP7scientificArea.trim().isEmpty()) {
-                //Vocabulary relfundinglevel2Vocabulary = vocabularyManager.getVocabulary("areas", Locale.ROOT);
-                queryBuilder.append(" and (relfundershortname exact \"EC\")").append(" and (relfundinglevel2_name exact \"").append(FP7scientificArea).append("\")");
-            }
-        }
-
-    }
-
-    public static void enhanceProjectQueryWithFundingLevelParams(StringBuilder queryBuilder, HttpServletRequest request, VocabularyManager vocabularyManager) {
-        String funder = request.getParameter("funder");
-        String fundingStream = request.getParameter("fundingStream");
-        String FP7scientificArea = request.getParameter("FP7scientificArea");
-
-        if (funder != null) {
-            //addExactQueryTerm("fundinglevel0_name", funder.toUpperCase(), queryBuilder);
-            //Vocabulary funderVocabulary = vocabularyManager.getVocabulary("funders_simple", Locale.ROOT);
-            addExactQueryTerm("fundershortname", funder.toUpperCase(), queryBuilder);
-        }
-
-        if (fundingStream != null && !fundingStream.trim().isEmpty()) {
-            //addExactQueryTerm("fundinglevel1_name", fundingStream.toUpperCase(), queryBuilder);
-            if(fundingStream.equalsIgnoreCase("FP7") || fundingStream.equalsIgnoreCase("H2020")) {
-                addORQueryTermExact(new String[]{"fundinglevel0_name", "fundinglevel1_name", "fundinglevel2_name"}, "\"" + fundingStream.toUpperCase() + "\"", queryBuilder);
-            } else {
-                addORQueryTermExact(new String[]{"fundinglevel0_name", "fundinglevel1_name", "fundinglevel2_name"}, "\"" + fundingStream + "\"", queryBuilder);
-            }
-        }
-
-        if (FP7scientificArea != null && !FP7scientificArea.trim().isEmpty()) {
-            //Vocabulary relfundinglevel2Vocabulary = vocabularyManager.getVocabulary("areas", Locale.ROOT);
-            queryBuilder.append("and (fundershortname exact \"EC\")").append(" and (fundinglevel2_name exact \"").append(FP7scientificArea).append("\")");
-        }
-    }
-
-    public static void enhanceQueryWithFundingParams(StringBuilder queryBuilder, HttpServletRequest request) {
-        String hasECFunding = request.getParameter("hasECFunding");
-        String hasWTFunding = request.getParameter("hasWTFunding");
-
-        addBooleanQueryTerm("contextid", hasECFunding, "EC", queryBuilder);
-        addBooleanQueryTerm("contextid", hasWTFunding, "WT", queryBuilder);
-    }
-
-    public static void enhanceQueryWithCommunityParams(StringBuilder queryBuilder, HttpServletRequest request) {
-        String community = request.getParameter("community");
-
-        if (community!= null) {
-            addExactQueryTerm("communityId", community, queryBuilder);
-        }
-
-    }
-
-    public static void enhanceQueryWithProjectFundingParams(StringBuilder queryBuilder, HttpServletRequest request) {
-        String hasECFunding = request.getParameter("hasECFunding");
-        String hasWTFunding = request.getParameter("hasWTFunding");
-
-        addBooleanQueryTerm("funderid", hasECFunding, "ec__________::EC", queryBuilder);
-        addBooleanQueryTerm("funderid", hasWTFunding, "wt__________::WT", queryBuilder);
-
-    }
-
-    public static void enhanceQueryWithRelProjectParams(StringBuilder queryBuilder, HttpServletRequest request) {
-        String hasProject = request.getParameter("hasProject");
-        String projectID = request.getParameter("projectID");
-        String FP7ProjectID = request.getParameter("FP7ProjectID");
-
-        if (hasProject != null && !hasProject.isEmpty()) {
-            if (hasProject.equals("true")) {
-                addEqualQueryTerm("relprojectid", "*", queryBuilder);
-            } else {
-                addNotEqualQueryTerm("relprojectid", "*", queryBuilder);
-            }
-        }
-
-        if (FP7ProjectID != null && !FP7ProjectID.trim().isEmpty()) {
-            addExactQueryTerm("relprojectcode", FP7ProjectID, queryBuilder);
-            addExactQueryTerm(" relfundinglevel0_id", "ec__________::EC::FP7", queryBuilder);
-        }
-
-        if (projectID != null && !projectID.trim().isEmpty()) {
-            queryBuilder.append(" and (relprojectcode exact \"").append(projectID).append("\")");
-        }
-    }
-
-    public static void enhanceQueryWithAccessRights(StringBuilder queryBuilder, HttpServletRequest request) {
-        String oa = request.getParameter("OA");
-        addBooleanQueryTerm("resultbestaccessright", oa, "Open Access", queryBuilder);
-    }
-
-    public static void enhanceQueryWithDate(StringBuilder queryBuilder, HttpServletRequest request) throws IllegalArgumentException{
-        String fromDateAccepted = request.getParameter("fromDateAccepted");
-        String toDateAccepted = request.getParameter("toDateAccepted");
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        simpleDateFormat.setLenient(false);
-
-        if (toDateAccepted != null && !toDateAccepted.isEmpty() && (fromDateAccepted == null || fromDateAccepted.isEmpty()) ) {
-            if(!checkDate(toDateAccepted, simpleDateFormat)){
-                //logger.debug("Format is " + !checkDate(toDateAccepted, simpleDateFormat));
-                throw new IllegalArgumentException("toDateAccepted date must be formatted as YYYY-MM-DD");
-            }
-            fromDateAccepted = "*";
-        }
-
-        if (fromDateAccepted != null && !fromDateAccepted.isEmpty() && (toDateAccepted == null || toDateAccepted.isEmpty()) ) {
-            if (!checkDate(fromDateAccepted, simpleDateFormat)){
-                //logger.debug("Format from is " + fromDateAccepted != null && !fromDateAccepted.isEmpty());
-                throw new IllegalArgumentException("fromDateAccepted date must be formatted as YYYY-MM-DD");
-            }
-            toDateAccepted = simpleDateFormat.format(new Date());
-        }
-
-        if (toDateAccepted != null && !toDateAccepted.isEmpty() && fromDateAccepted != null && !fromDateAccepted.isEmpty()) {
-            queryBuilder.append(" and (resultdateofacceptance within \"").append(fromDateAccepted).append(" ").append(toDateAccepted).append("\")");
-        }
-    }
-
-
-    public static void enhanceQueryWithYearParams(StringBuilder queryBuilder, HttpServletRequest request) {
-        String startYear = request.getParameter("startYear");
-        String endYear = request.getParameter("endYear");
-
-        int sYear = -1;
-        if (startYear != null && !startYear.isEmpty()) {
-            try {
-                sYear = Integer.parseInt(startYear);
-
-            } catch(NumberFormatException e) {
-                throw new IllegalArgumentException("startYear parameter must be a numeric value.", e);
-            }
-        }
-
-        int eYear = -1;
-        if (endYear !=null && !endYear.isEmpty()) {
-            try {
-                eYear = Integer.parseInt(endYear);
-
-            } catch(NumberFormatException e) {
-                throw new IllegalArgumentException("endYear parameter must be a numeric value.",e);
-            }
-        }
-
-        if (eYear != -1 && sYear != -1 && eYear < sYear) {
-            throw new IllegalArgumentException("endYear must be greater than startYear.");
-        }
-
-        addExactQueryTerm("projectstartyear", startYear, queryBuilder);
-        addExactQueryTerm("projectendyear", endYear, queryBuilder);
-    }
-
-    public static void enhanceQueryWithResultsSortParameters(StringBuilder queryBuilder, HttpServletRequest request) {
-        String sortByParameter = request.getParameter("sortBy");
-
-        if (sortByParameter != null) {
-            String[] sortParams = sortByParameter.split(",");
-
-            if (sortParams.length != 2) {
-                throw new IllegalArgumentException("Invalid sort paremeter. 'sortBy' parameter format is <fieldName>[,ascending|,descending].");
-            }
-
-            String sortByField = sortParams[0];
-            String order = sortParams[1];
-
-            if (!checkPublicationSortParameterFields(sortByField)){
-                throw new IllegalArgumentException("'" + sortByField + "' is not a sortable field.");
-            }
-
-            if (!checkOrder(order)) {
-                throw new IllegalArgumentException("'" + order + "' is not a valid ordering. Please use one of {ascending, descending}");
-            }
-
-            addSortParameter(sortByField, order, queryBuilder);
-        }
-    }
-
-    public static void enhanceQueryWithProjectSortParameters(StringBuilder queryBuilder, HttpServletRequest request) {
-        String sortByParameter = request.getParameter("sortBy");
-
-        if (sortByParameter != null) {
-            String[] sortParams = sortByParameter.split(",");
-
-            if (sortParams.length != 2) {
-                throw new IllegalArgumentException("Invalid sort paremeter. 'sortBy' parameter format is <fieldName>[,ascending|,descending].");
-            }
-
-            String sortByField = sortParams[0];
-            String order = sortParams[1];
-
-            if (!checkProjectSortParameterFields(sortByField)){
-                throw new IllegalArgumentException("'" + sortByField + "' is not a sortable field.");
-            }
-
-            if (!checkOrder(order)) {
-                throw new IllegalArgumentException("'" + order + "' is not a valid ordering. Please use one of {ascending, descending}");
-            }
-
-            addSortParameter(sortByField, order, queryBuilder);
-        }
-    }
-
-    private static boolean checkPublicationSortParameterFields(String sortField) {
-        if ((sortField != null) && (!sortField.isEmpty()) &&
-                sortField.matches("dateofcollection|resultstoragedate|resultembargoenddate|resultembargoendyear|" +
-                "resulttypeid|resulttypename|resultlanguageid|resultlanguagename|resultbestaccessright|" +
-                "resultbestlicenseid|resultdateofacceptance|resultacceptanceyear")) {
-            return true;
-        }
-        return false;
-    }
-
-    private static boolean checkProjectSortParameterFields(String sortField) {
-        if ((sortField != null) && (!sortField.isEmpty()) &&
-                sortField.matches("dateofcollection|projectstartdate|projectstartyear|" +
-                        "projectenddate|projectendyear|projectcallidentifier|projectduration|" +
-                        "projectecsc39|projectcontracttypeid|projectcontracttypename")) {
-            return true;
-        }
-        return false;
-    }
-
-    private static boolean checkOrder(String order) {
-        if (order.matches("ascending|descending")) {
-            return true;
-        }
-        return false;
-    }
-
-    public static boolean checkDate(String date, SimpleDateFormat simpleDateFormat) {
-        try {
-            simpleDateFormat.parse(date);
-
-        } catch (ParseException pe) {
-            logger.warn("Wrong date format.", pe);
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Enhance the given CQL query with OpenAIRE specific ids
-     * @param queryBuilder The string builder of the query
-     * @param request the HTTP request
-     */
-    public static void enhanceQueryWithOpenAIREIds(StringBuilder queryBuilder, HttpServletRequest request) {
-        String[] openairePublicationIDs = request.getParameterValues("openairePublicationID");
-        String[] openaireDatasetIDs = request.getParameterValues("openaireDatasetID");
-        String[] openaireSoftwareIDs = request.getParameterValues("openaireSoftwareID");
-        String[] openaireOtherIDs = request.getParameterValues("openaireOtherID");
-        String[] openaireProviderIDs  = request.getParameterValues("openaireProviderID");
-        String[] openaireProjectIDs  = request.getParameterValues("openaireProjectID");
-
-        enhanceQueryWithIds("objidentifier", openairePublicationIDs, queryBuilder);
-        enhanceQueryWithIds("objidentifier", openaireDatasetIDs, queryBuilder);
-        enhanceQueryWithIds("objidentifier", openaireSoftwareIDs, queryBuilder);
-        enhanceQueryWithIds("objidentifier", openaireOtherIDs, queryBuilder);
-        enhanceQueryWithIds("resulthostingdatasourceid", openaireProviderIDs, queryBuilder);
-        enhanceQueryWithIds("relprojectid", openaireProjectIDs, queryBuilder);
-    }
-
-    public static void enhanceQueryWithMetadataKeywords(StringBuilder queryBuilder, HttpServletRequest request) {
-        String keywords = request.getParameter("keywords");
-        String title = request.getParameter("title");
-        String author = request.getParameter("author");
-        String country = request.getParameter("country");
-
-        addMetadataQueryTerm(null, keywords, queryBuilder);
-        addMetadataQueryTerm("resulttitle", title, queryBuilder);
-        addMetadataQueryTerm("resultauthor", author, queryBuilder);
-        addMetadataQueryTerm("country", country, queryBuilder);
-    }
-
-    public static void enhanceQueryWithProjectMetadataKeywords(StringBuilder queryBuilder, HttpServletRequest request) {
-        String keywords = request.getParameter("keywords");
-        String acronym = request.getParameter("acronym");
-        String name = request.getParameter("name");
-        String grantID = request.getParameter("grantID");
-        String callID = request.getParameter("callID");
-
-        addMetadataQueryTerm(null, keywords, queryBuilder);
-        addMetadataQueryTerm("projectacronym", acronym, queryBuilder);
-        addEqualQueryTerm("projecttitle", name, queryBuilder);
-        addExactQueryTerm("projectcode", grantID, queryBuilder);
-        addExactQueryTerm("projectcallidentifier", callID, queryBuilder);
-    }
-
-    public static void enhanceQueryWithParticipantsInfoParams(StringBuilder queryBuilder, HttpServletRequest request) {
-        String[] participantCountries = request.getParameterValues("participantCountries");
-        String participantAcronyms = request.getParameter("participantAcronyms");
-        String openaireParticipantID = request.getParameter("openaireParticipantID");
-
-
-        if(participantCountries != null) {
-            enhanceQueryWithCommaSeparatedValues("relorganizationcountryid", participantCountries, queryBuilder);
-        }
-
-        addORQueryTerm("relorganizationname", "relorganizationshortname", participantAcronyms, queryBuilder);
-
-        if(openaireParticipantID != null) {
-            addEqualQueryTerm("relorganizationid", openaireParticipantID, queryBuilder);
-        }
-
-    }
-
-    public static void enhanceQueryWithSC39Params(StringBuilder queryBuilder, HttpServletRequest request) {
-        String sc39 = request.getParameter("sc39");
-        addBooleanQueryTerm("projectecsc39", sc39, queryBuilder);
-    }
-
-
-
-
-    public static void enhanceQueryWithDoi(StringBuilder queryBuilder, HttpServletRequest request) {
-        String[] dois = request.getParameterValues("doi");
-
-        if (dois != null && !(dois.length==0)) {
-            queryBuilder.append(" and ");
-            for (int i = 0; i < dois.length; i++) {
-                String[] commaSeparated = dois[i].split(",");
-                for (int j = 0; j < commaSeparated.length; j++) {
-                    queryBuilder.append("(pidclassid exact \"doi\" and pid exact \"").append(commaSeparated[j]).append("\")");
-                    if (i < dois.length-1 || j < commaSeparated.length-1 ) {
-                        queryBuilder.append(" or ");
-                    }
-                }
-            }
-        }
-    }
-
-    public static void enhanceProjectQueryWithOpenAIREIds(StringBuilder queryBuilder, HttpServletRequest request) {
-        String openaireProjectID  = request.getParameter("openaireProjectID");
-
-        if (openaireProjectID != null) {
-            addExactQueryTerm("objIdentifier", openaireProjectID, queryBuilder);
-        }
-    }
-
-    public static void enhanceQueryWithIds(String idIndexFieldName, String[] ids, StringBuilder queryBuilder) {
-        if (ids != null && !(ids.length==0)) {
-            queryBuilder.append(" and ");
-            for (int i = 0; i < ids.length; i++) {
-                String[] commaSeparated = ids[i].split(",");
-                for (int j = 0; j < commaSeparated.length; j++) {
-                    queryBuilder.append("(" + idIndexFieldName + " exact \"").append(commaSeparated[j]).append("\")");
-                    if (i < ids.length-1 || j < commaSeparated.length-1 ) {
-                        queryBuilder.append(" or ");
-                    }
-                }
-            }
-        }
-    }
-
-    public static void enhanceQueryWithCommaSeparatedValues(String indexFieldName, String[] fieldValues, StringBuilder queryBuilder) {
-        if (fieldValues != null && !(fieldValues.length==0)) {
-            queryBuilder.append(" and ");
-            for (int i = 0; i < fieldValues.length; i++) {
-                String[] commaSeparated = fieldValues[i].split(",");
-                for (int j = 0; j < commaSeparated.length; j++) {
-                    queryBuilder.append("(").append(indexFieldName).append(" exact \"").append(commaSeparated[j].toUpperCase()).append("\")");
-                    if (i < fieldValues.length-1 || j < commaSeparated.length-1 ) {
-                        queryBuilder.append(" and ");
-                    }
-                }
-            }
-        }
-    }
-
-    public static void addMetadataQueryTerm(String indexFieldName, String fieldValue, StringBuilder queryBuilder) {
-        if (fieldValue != null && !fieldValue.trim().isEmpty()) {
-            if(indexFieldName != null) {
-                for (String term: fieldValue.trim().split(" ")){
-                    addEqualQueryTerm(indexFieldName, term, queryBuilder);
-                }
-            } else {
-                queryBuilder.append(" and ( " );
-                String[] keywords = fieldValue.trim().split(" ");
-                for (int i = 0; i < keywords.length; i++) {
-                    if (i == keywords.length -1) {
-                        queryBuilder.append(keywords[i]);
-                    } else {
-                        queryBuilder.append(keywords[i]).append(" and ");
-                    }
-                }
-                queryBuilder.append(")" );
-            }
-        }
-    }
-
-    public static void addORQueryTerm(String indexFieldName1, String indexFieldName2, String fieldValue, StringBuilder queryBuilder) {
-        if (fieldValue != null && !fieldValue.trim().isEmpty()) {
-            for (String term: fieldValue.trim().split(" ")) {
-                queryBuilder.append(" and (" + indexFieldName1 + " = " + term + " or  " + indexFieldName2 + " = " + term + ")");
-            }
-        }
-    }
-
-    public static void addORQueryTerm(String[] indexFields, String fieldValue, StringBuilder queryBuilder) {
-        if (fieldValue != null && !fieldValue.trim().isEmpty()) {
-            queryBuilder.append(" and ( ");
-            for (int i = 0; i < indexFields.length; i++) {
-                for (String term : fieldValue.trim().split(",(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)", -1)) {
-                    //logger.info("term: " + term);
-                    queryBuilder.append(" (" + indexFields[i] + " = " + term + ")");
-                }
-
-                if (i == indexFields.length-1) {
-                    queryBuilder.append(")");
-
-                } else {
-                    queryBuilder.append(" or ");
-                }
-
-            }
-        }
-    }
-
-    public static void addORQueryTermExact(String[] indexFields, String fieldValue, StringBuilder queryBuilder) {
-        if (fieldValue != null && !fieldValue.trim().isEmpty()) {
-            queryBuilder.append(" and ( ");
-            for (int i = 0; i < indexFields.length; i++) {
-                for (String term : fieldValue.trim().split(",(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)", -1)) {
-                    //logger.info("term: " + term);
-                    queryBuilder.append(" (" + indexFields[i] + " exact " + term + ")");
-                }
-
-                if (i == indexFields.length-1) {
-                    queryBuilder.append(")");
-
-                } else {
-                    queryBuilder.append(" or ");
-                }
-
-            }
-        }
-    }
-
-    private static void addBooleanQueryTerm(String indexFieldName, String requestValue, StringBuilder queryBuilder) {
-        if (requestValue != null && !requestValue.trim().isEmpty()) {
-            addExactQueryTerm(indexFieldName, requestValue, queryBuilder);
-        }
-    }
-
-    public static void addBooleanQueryTerm(String indexFieldName, String requestValue, String fieldValue, StringBuilder queryBuilder){
-        if (requestValue != null && !requestValue.trim().isEmpty()) {
-            if (requestValue.trim().equals("true")) {
-                addExactQueryTerm(indexFieldName, fieldValue, queryBuilder);
-            } else {
-                addDifferentQueryTerm(indexFieldName, fieldValue, queryBuilder);
-            }
-        }
-    }
-
-    public static void addExactQueryTerm(String indexFieldName, String fieldValue, StringBuilder queryBuilder){
-        if (fieldValue != null && !fieldValue.trim().isEmpty()) {
-            CQLQueryBuilder.appendFieldQuotedTerm(queryBuilder, CQLQueryBuilder.Operator.AND, indexFieldName, CQLQueryBuilder.Operator.EXACT, fieldValue);
-        }
-    }
-
-    public static void addEqualQueryTerm(String indexFieldName, String fieldValue, StringBuilder queryBuilder){
-        if (fieldValue != null && !fieldValue.trim().isEmpty()) {
-            if (fieldValue.startsWith("\"") && fieldValue.endsWith("\"")) {
-                CQLQueryBuilder.appendFieldTerm(queryBuilder, CQLQueryBuilder.Operator.AND, indexFieldName, CQLQueryBuilder.Operator.EQUAL, fieldValue);
-            } else {
-                CQLQueryBuilder.appendFieldQuotedTerm(queryBuilder, CQLQueryBuilder.Operator.AND, indexFieldName, CQLQueryBuilder.Operator.EQUAL, fieldValue);
-            }
-        }
-
-
-
-
-    }
-
-    public static void addNotEqualQueryTerm(String indexFieldName, String fieldValue, StringBuilder queryBuilder){
-        if (fieldValue != null && !fieldValue.trim().isEmpty()) {
-            CQLQueryBuilder.appendFieldQuotedTerm(queryBuilder, CQLQueryBuilder.Operator.NOT, indexFieldName, CQLQueryBuilder.Operator.EQUAL, fieldValue);
-        }
-    }
-
-    public static void addDifferentQueryTerm(String indexFieldName, String fieldValue, StringBuilder queryBuilder){
-        if (fieldValue != null && !fieldValue.trim().isEmpty()) {
-            CQLQueryBuilder.appendFieldQuotedTerm(queryBuilder, CQLQueryBuilder.Operator.AND, indexFieldName, CQLQueryBuilder.Operator.NOTEQUAL, fieldValue);
-        }
-    }
-
-    public static void addVocabularizedQueryTerm(String indexFieldName, String fieldValue, Vocabulary vocabulary, StringBuilder queryBuilder){
-        if (fieldValue != null && !fieldValue.trim().isEmpty()) {
-            addExactQueryTerm(indexFieldName, devocabularizedTerm(fieldValue, vocabulary), queryBuilder);
-        }
-    }
-
-    private static void addSortParameter(String indexField, String order, StringBuilder queryBuilder) {
-        queryBuilder.append(" sortBy " + indexField + "/sort." + order);
-    }
-
-    /**
-     * Returns the encoding of the given value. If the encoding does not exist
-     * in the given vocabulary the method returns the original value.|
-     * @param value the value to be encoded
-     * @param vocabulary the vocabulary containing the encoding - value mapping
-     * @return the encoding of the given value taken from the given vocabulary
-     */
-    public static String devocabularizedTerm(String value, Vocabulary vocabulary) {
-        if (vocabulary != null) {
-            String term = vocabulary.getEncoding(value);
-            if (term == null) {
-                return value;
-            }
-            return term;
-        }
-        return value;
-    }
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/cql/CQLQueryBuilder.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/cql/CQLQueryBuilder.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/cql/CQLQueryBuilder.java	(nonexistent)
@@ -1,110 +0,0 @@
-package eu.dnetlib.data.search.utils.cql;
-
-import org.apache.log4j.Logger;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Created by kiatrop on 28/9/2016.
- */
-public class CQLQueryBuilder {
-
-    private final static Logger logger = Logger.getLogger(CQLQueryBuilder.class);
-
-    public enum Operator {
-        AND("and"),
-        OR("or"),
-        NOT("not"),
-        EQUAL("="),
-        EXACT("exact"),
-        NOTEQUAL("<>"),
-        NONE("");
-
-        private String value;
-        Operator(String value) {
-            this.value = value;
-        }
-        private String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return this.getValue();
-        }
-    }
-
-    public static void appendQuery(StringBuilder stringBuilder, String query) {
-        if (query != null && !query.trim().isEmpty()) {
-            appendSimpleTerm(stringBuilder, Operator.AND, query);
-        }
-    }
-    public static void appendKeywords(StringBuilder stringBuilder, String keywords) {
-        if (keywords != null && !keywords.trim().isEmpty()) {
-            List<String> matchList = new ArrayList<String>();
-
-            Pattern regex = Pattern.compile("[^\\s\"']+|\"[^\"]*\"|'[^']*'");
-            Matcher regexMatcher = regex.matcher(keywords);
-            while (regexMatcher.find()) {
-                matchList.add(regexMatcher.group());
-            }
-
-            for (String keyword : matchList) {
-                if (keyword.endsWith("\"") && keyword.startsWith("\"")) {
-                    appendSimpleQuotedTerm(stringBuilder, Operator.AND, keyword);
-
-                } else {
-                    appendSimpleTerm(stringBuilder, CQLQueryBuilder.Operator.AND, keyword.replaceAll("\"",""));
-                }
-            }
-        }
-    }
-
-    public static void appendSimpleTerm(StringBuilder stringBuilder, Operator queryOperator, String value) {
-        if (!stringBuilder.toString().isEmpty()) {
-            stringBuilder.append(' ').append(queryOperator).append(" (").append(value).append(')');
-        } else {
-            stringBuilder.append("(").append(value).append(')');
-        }
-    }
-
-    public static void appendSimpleQuotedTerm(StringBuilder stringBuilder, Operator queryOperator, String value) {
-        if (!stringBuilder.toString().isEmpty()) {
-            stringBuilder.append(' ').append(queryOperator).append(" (__all exact ").append(value).append(")");
-        } else {
-            stringBuilder.append(" (__all exact ").append(value).append(")");
-        }
-    }
-
-    public static void appendFieldTerm(StringBuilder stringBuilder, Operator queryOperator, String indexFieldName, Operator termOperator, String fieldValue) {
-            stringBuilder.append(' ').append(queryOperator).
-                    append(" (").append(indexFieldName).append(' ').append(termOperator).append(' ').append(fieldValue).append(")");
-    }
-
-    public static void appendFieldQuotedTerm(StringBuilder stringBuilder, Operator queryOperator, String indexFieldName, Operator termOperator, String fieldValue) {
-            stringBuilder.append(' ').append(queryOperator).
-                    append(" (").append(indexFieldName).append(' ').append(termOperator).append(" \"").append(fieldValue).append("\")");
-    }
-
-    public static void appendFieldTerms(StringBuilder stringBuilder, Operator queryOperator, String indexFieldName, Operator termOperator, List<String> fieldValues) {
-        for (String fieldValue: fieldValues) {
-            appendFieldTerm(stringBuilder, queryOperator, indexFieldName, termOperator, fieldValue);
-        }
-    }
-
-    public static void appendFieldQuotedTerms(StringBuilder stringBuilder, Operator queryOperator, String indexFieldName, Operator termOperator, List<String> fieldValues) {
-        for (String fieldValue: fieldValues) {
-            appendFieldQuotedTerm(stringBuilder, queryOperator, indexFieldName, termOperator, fieldValue);
-        }
-    }
-
-    public static void appendEnhancedKeywords(StringBuilder stringBuilder, String keywords) {
-        if (keywords != null && !keywords.trim().isEmpty()) {
-            appendSimpleTerm(stringBuilder, CQLQueryBuilder.Operator.AND, keywords);
-        }
-    }
-
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/solr/SolrResultSetOptionsUtil.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/solr/SolrResultSetOptionsUtil.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/solr/SolrResultSetOptionsUtil.java	(nonexistent)
@@ -1,77 +0,0 @@
-package eu.dnetlib.data.search.utils.solr;
-
-
-import eu.dnetlib.functionality.cql.CqlTranslator;
-import eu.dnetlib.functionality.cql.CqlTranslatorImpl;
-import eu.dnetlib.functionality.cql.lucene.TranslatedQuery;
-import org.apache.log4j.Logger;
-import org.apache.solr.common.util.NamedList;
-import org.z3950.zing.cql.CQLParseException;
-
-import java.io.IOException;
-
-/**
- * Created by kiatrop on 21/11/2016.
- */
-public class SolrResultSetOptionsUtil {
-
-    private static final Logger logger = Logger.getLogger(SolrResultSetOptionsUtil.class);
-
-    public static NamedList<String> extractQueryOptions(String eprQuery) throws CQLParseException, IOException {
-        CqlTranslator translator = new CqlTranslatorImpl();
-        NamedList<String> queryOpts = new NamedList<String>();
-        String[] queryParts = eprQuery.split("&groupby=");
-
-        logger.info("QUERY: " + queryParts[0].replace("query=",""));
-        TranslatedQuery translatedQuery = translator.getTranslatedQuery(queryParts[0].replace("query=",""));
-        queryOpts.add("q", translatedQuery.asLucene());
-        queryOpts.add("fl", "__result");
-        queryOpts.add("shards.tolerant","true");
-
-        if (translatedQuery.getOptions() != null && translatedQuery.getOptions().getSort()!= null  ) {
-            queryOpts.add("sort", translatedQuery.getOptions().getSort().getField() + " " + translatedQuery.getOptions().getSort().getMode());
-        }
-
-        if (queryParts.length > 1) {
-            String[] facetParts = queryParts[1].split("&fq=");
-
-            String[] refineParts = null;
-            String[] facetQueries = null;
-
-            if (facetParts != null && facetParts.length > 0) {
-                if (!facetParts[0].isEmpty()) {
-                    refineParts = facetParts[0].split(",(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)", -1);
-                }
-
-                if (facetParts.length > 1){
-                    facetQueries = facetParts[1].split(",(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)", -1);
-                }
-
-                if (facetParts[0].isEmpty() && facetParts.length > 1) {
-                    facetQueries = facetParts[1].split(",(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)", -1);
-                }
-            }
-
-            if (refineParts != null && refineParts.length > 0) {
-                queryOpts.add("facet", "true");
-                queryOpts.add("facet.mincount", "1");
-                queryOpts.add("facet.threads", refineParts.length + "");
-                for (String field : refineParts) {
-                    queryOpts.add("facet.field", field);
-                }
-            }
-
-            if (facetQueries!=null && facetQueries.length > 0) {
-                //queryOpts.add("q.op", "AND"); TODO is it correct?
-
-                for (String facetPart : facetQueries) {
-                    logger.debug("facet Part " + facetPart);
-                    queryOpts.add("fq", translator.toLucene(facetPart));
-                }
-            }
-
-        }
-
-        return queryOpts;
-    }
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/solr/SolrResultsFormatter.java
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/solr/SolrResultsFormatter.java	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/src/main/java/eu/dnetlib/data/search/utils/solr/SolrResultsFormatter.java	(nonexistent)
@@ -1,43 +0,0 @@
-package eu.dnetlib.data.search.utils.solr;
-
-import org.json.XML;
-
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Created by kiatrop on 16/11/2016.
- */
-public class SolrResultsFormatter {
-
-    //private static final Logger logger = Logger.getLogger(SolrResultsFormatter.class);
-
-    public static String jsonList2Json(List<String> jsons) {
-        StringBuilder entitesBuilder = new StringBuilder();
-
-        for(Iterator<String> jsonIterator = jsons.iterator(); jsonIterator.hasNext();){
-            entitesBuilder.append(jsonIterator.next());
-            if(jsonIterator.hasNext()){
-                entitesBuilder.append(",");
-            }
-        }
-        return entitesBuilder.toString();
-    }
-
-    public static String xml2Json(String resultXml) {
-        if (resultXml!= null) {
-            return XML.toJSONObject(resultXml).toString();
-        }
-
-        return "";
-    }
-
-    //TODO check if needed
-    /*public static String xml2Csv(String resultXml) {
-        if (resultXml!= null) {
-            //TODO add code;
-        }
-
-        return "";
-    }*/
-}
Index: modules/uoa-search/tags/uoa-search-3.5.2/pom.xml
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2/pom.xml	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2/pom.xml	(nonexistent)
@@ -1,250 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>eu.dnetlib</groupId>
-		<artifactId>dnet45-parent</artifactId>
-		<version>1.0.0</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>eu.dnetlib</groupId>
-	<artifactId>uoa-search</artifactId>
-	<packaging>jar</packaging>
-	<version>3.5.2</version>
-	<scm>
-                <developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet45/modules/uoa-search/tags/uoa-search-3.5.2</developerConnection> 
-        </scm>
-
-    <repositories>
-        <!-- Cloudera Repositories -->
-        <repository>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <id>cloudera-central</id>
-            <name>cloundera-libs-release</name>
-            <url>http://maven.research-infrastructures.eu/nexus/content/repositories/cloudera-central</url>
-        </repository>
-        <repository>
-            <id>cloudera-snapshots</id>
-            <name>cloudera-libs-snapshot</name>
-            <url>http://maven.research-infrastructures.eu/nexus/content/repositories/cloudera-snapshots</url>
-        </repository>
-        <repository>
-            <id>typesafe</id>
-            <name>typesafe-releases</name>
-            <url>http://maven.research-infrastructures.eu/nexus/content/repositories/typesafe</url>
-        </repository>
-    </repositories>
-
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>eu.dnetlib</groupId>
-			<artifactId>uoa-commons</artifactId>
-			<version>[2.0.0, 3.0.0)</version>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>1.6</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.solr</groupId>
-			<artifactId>solr-solrj</artifactId>
-			<version>7.2.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.zookeeper</groupId>
-                    <artifactId>zookeeper</artifactId>
-                </exclusion>
-            </exclusions>
-		</dependency>
-        <dependency>
-            <groupId>org.apache.zookeeper</groupId>
-            <artifactId>zookeeper</artifactId>
-            <version>3.4.5-cdh4.3.0</version>
-        </dependency>
-		<dependency>
-			<groupId>eu.dnetlib</groupId>
-			<artifactId>cnr-cql-utils</artifactId>
-			<version>[2.0.0, 3.0.0)</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>eu.dnetlib</groupId>
-			<artifactId>cnr-blackboard-common</artifactId>
-			<version>[2.2.1, 3.0.0)</version>
-		</dependency>
-
-		<!-- Spring MVC framework -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.velocity</groupId>
-			<artifactId>velocity</artifactId>
-			<version>1.7</version>
-		</dependency>
-
-		<dependency>
-			<groupId>asm</groupId>
-			<artifactId>asm</artifactId>
-			<version>3.3.1</version>
-		</dependency>
-		<dependency>
-			<groupId>com.sun.jersey</groupId>
-			<artifactId>jersey-bundle</artifactId>
-			<version>1.19</version>
-		</dependency>
-		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-			<version>20140107</version>
-		</dependency>
-		<dependency>
-			<groupId>com.sun.jersey</groupId>
-			<artifactId>jersey-server</artifactId>
-			<version>1.19</version>
-		</dependency>
-		<dependency>
-			<groupId>com.sun.jersey</groupId>
-			<artifactId>jersey-core</artifactId>
-			<version>1.19</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-validator</groupId>
-			<artifactId>commons-validator</artifactId>
-			<version>1.6</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.persistence</groupId>
-			<artifactId>org.eclipse.persistence.moxy</artifactId>
-			<version>2.5.0</version>
-		</dependency>
-		<dependency>
-			<groupId>com.sun.jersey.contribs</groupId>
-			<artifactId>jersey-spring</artifactId>
-			<version>1.8</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-core</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-web</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-beans</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-context</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-utils</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-aop</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>2.3.1</version>
-		</dependency>
-		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>3.5</version>
-		</dependency>
-
-		<dependency>
-			<groupId>io.prometheus</groupId>
-			<artifactId>simpleclient</artifactId>
-			<version>0.6.0</version>
-		</dependency>
-
-
-		<dependency>
-			<groupId>io.prometheus</groupId>
-			<artifactId>simpleclient_servlet</artifactId>
-			<version>0.6.0</version>
-		</dependency>
-
-		<dependency>
-			<groupId>io.prometheus</groupId>
-			<artifactId>simpleclient_hotspot</artifactId>
-			<version>0.6.0</version>
-		</dependency>
-
-		<!-- https://mvnrepository.com/artifact/io.micrometer/micrometer-registry-prometheus -->
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-registry-prometheus</artifactId>
-			<version>1.2.0</version>
-		</dependency>
-
-		<!-- https://mvnrepository.com/artifact/io.micrometer/micrometer-spring-legacy -->
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-spring-legacy</artifactId>
-			<version>1.2.0</version>
-		</dependency>
-
-
-		<!-- https://mvnrepository.com/artifact/org.aspectj/aspectjrt -->
-		<!-- AspectJ -->
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>aspectjrt</artifactId>
-			<version>1.9.4</version>
-		</dependency>
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>aspectjweaver</artifactId>
-			<version>1.9.4</version>
-		</dependency>
-
-        <!-- https://mvnrepository.com/artifact/org.apache.maven/maven-model -->
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-model</artifactId>
-            <version>3.3.9</version>
-        </dependency>
-
-
-
-    </dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>
Index: modules/uoa-search/tags/uoa-search-3.5.2
===================================================================
--- modules/uoa-search/tags/uoa-search-3.5.2	(revision 56703)
+++ modules/uoa-search/tags/uoa-search-3.5.2	(nonexistent)

Property changes on: modules/uoa-search/tags/uoa-search-3.5.2
___________________________________________________________________
Deleted: svn:ignore
## -1,11 +0,0 ##
-*.iml
-.classpath
-velocity.log
-.settings
-target
-.project
-*.iml
-deploy*
-deployShadow
-report.xml
-
